I think resolveCollision() could be better?