Added framework for waypoint system