added waypoints, url handling, main navigation.