Refactoring code.  Working on Config.