Added basic physics stuff.
Merge resolution