Pre-branch commit
Started refactoring
Updated services package
More refactoring and several bug changes
Exceptionhandling almost working