qqq
Service class introducing
Unit tests introducing
Merge branch 'feature-service' into develop