WIP - Add CLI arguments to override config file