- added more todos
- fully working
- moved model-service tests to a separate test-file
Merge remote-tracking branch 'origin/master'