getting rigid body working
merge