adding basic physics simulation
merge