Moved all the collision stuff