Started on collision, and stuff
Merge fix