added dev branch of waypoints module