Saving work on structs

Work was done on features/er-restapi, but should be committed here
Merge branch 'feature/er-structs' into development