halfway through fixing something with collisions