Added collision detection woohoo