WIP: Phase 2 #2

Draft
dubey wants to merge 27 commits from phase2 into main
12 changed files with 669 additions and 34 deletions
Showing only changes of commit 800e4f72f2 - Show all commits