This switches to the new configuration mechanism. I had to add a number of options to the blocks to make this happen.
I haven't actually tested this yet, beyond ensuring that it runs in one configuration.
cc @boeriu @calpigia