Starting to move things to config file