Collision Partially Fixed

Going to need to think about it some more.