Rigid bodies stuff about to be pushed to svn