Modified for movement and working on a new waypoint system