Still refactoring...

Collision is not working anymore