Work on unified collision detection for objects
More work on collisions