Code review: added todos
Merge branch 'encryption' of ssh://github.com/weeeeeew/GDCN into encryption