Fix Collision detection

Now we have kind of a working collision detection.  Not all the tests
are passing but it seems to work in game.