Worked some more on collision detection. Something's still not quite right