Service layer
Merge branch 'master' of github.com:kan-izh/harry-potter