Added collision detection

This is pretty crazy at the moment