Added ships and more waypoint stuff.