new config options

This is a major change, but going further should be pretty simple from here on.