Big Design Update #2

Merged
davidml merged 17 commits from dev into master 2021-12-15 15:21:54 +00:00