Starting router work
resolve conflicts
Merge pull request #20 from oldfartdeveloper/oldfartdeveloper-dmitri

Merge conflicts