Brace yourself: Refactoring is coming
This ist a backup commit. Compiling and running, but incomplete...