The coupling of heat and particle exhaust with impurity control, as part of the plasma-wall interaction problem, is one of the major challenges currently constraining the further development of fusion research. The research scope of the FZJ 3D edge physics team is aimed controlling and optimizing divertor configuration, edge plasma stability and transport to support long-pulse high-power high-performance plasma operation in tokamak and stellarator. To this end, we will work on developing 3D edge plasma diagnostics and modeling to support experiments at Wendelstein 7-X (W7-X) and future fusion devices (JT-60SA, ITER).