Even better error management. Better separation of concerns this way
Merge branch 'NewStructure' into develop