Finish re-working the route match classes