Forgot to do some commits, construct em all at once
Merge branch 'design-initial-structure' into development

* design-initial-structure:
  Forgot to do some commits, construct em all at once