Submission after handling collisions

Handling collisions and such