Begin work on using mode instead of route_type