Collision detection fix
Wip collision resolution