Whoohoo, new collision detection!
Cleaned it up a little