Implemented new collision detection system - needs fixing