Don't make a new router every time we match
Add explanatory comments
Add comments