Code review and redesign (in progress)
Merge branch 'master' of https://github.com/vit1251/pjproject