Basic Collision

Still some bugs