collision detection refactored, ready to code display update