Stuff and things.
Merge remote-tracking branch 'origin/Domain-Logic-Redesign' into Domain-Logic-Redesign