Implement Router v2.1 ;)

See https://gist.github.com/1b54b0eaf48eabbcff24
for the TL;DR