added stubbed Waypoints classes