Platas branch

get the physics stuff into the master