collision refactoring + collisions with stars