Fixed Up Collisions

Still some issues with falling and how close/far you can get to the
objects, but mostly functional