Start moving some options to the config file