SWAP 2.0 - Developing a Resolution