protocol should be finished
merging with john
Merge branch 'master' of https://github.com/Azmisov/470-group