p2 physics implemented
p1 physics & refactoring