Cruising Under Sail: Incorporating "Voyaging Under Sail"