Initial commit
First version where collision handling works