WIP
Merge pull request #2 from pmorie/router-shards-proposal

WIP