redoing collision detection, but now it's got some 'fun' glitches