Fixed collision detection, still needs cleaning up