Physics code rewrite!
merge
merge part deux