app storage stuff added
service provider logic less buggy
Merge branch 'feature/bugs' into develop
factories implemented