Added collision detection and resolution!