Now uses the refactored routeParser.

Also fixed a lovely typo.
Refactoring the route matching.

This doesn't really want to be in the same place as the route parsing,
but they're pretty intrinsically linked by their shared in-memory
datastore. I will have to figure out a way to abstract this link.