made changes to config to be much better oo