Last commit before collision detection is implemented