Starting to refactor collisions