Refactoring + collision work.