the mess of the new style
Merge branch 'refactor' of https://github.com/cth-housemouse/housemouse into refactor