commit to save changes before refactor
refactor to modular config system