implementing physics
merge conflict