Implements waypoints
Adds hostname option