Revert "No real change, make it compile again"

This reverts commit 16cbc1b44d831702fc537e2c43ab95a4f0a36edc.
Changed everything. Made a DSL. Much to explain.