physics in progress, wont compile
merged, physics still not working
minor fixes
physics stuff