Mostly working collisions
Fixed collisions