Initial work setting up to bootstrap.
Merge branch 'feature/bootstrap-proem' into develop
Fix borked default aliases.
Merge branch 'hotfix/aliases-borked' into develop