Refactor Config [WIP]

Did you mean to check this in commented out?