First test passing
Most router stuff fleshed out
Initial QueryParams implementation
Update router
Merge master
Fix tests
Merge master
Merge branch 'master' into query-params
Support new param order
Update router and add lots of tests
Merge branch 'master' into query-params