Started adding collision detection