WIP towards a different, now DSL-based approach.