More fleshed out config and CLI interface