starting work on physic engine
bad merge