collision work
still working on collisions