Tweaked collision detection so it works. Optimize!