Refactoring. Collision logic moved to separate file.