Meh, let's go back to the old way. It'll make the CLI version easier to configure.