Added collision detection!!! it almost works!!!