2D Physics Merge from Doomlaser and fidelity3

This merges our changes to the 2d Phyiscs module into one