More implementation of collision detection

I have started further implementation of collision detection. I'm
holding off on implementing more, the 64 if statements create a small
but noticeable lag. We should see if we can come up with a better way
to implement this.