WIP: Refactorization #1

Draft
don wants to merge 6 commits from refactor into dev

6 Commits (master)