Starting to add config options