refactoring progress
working on rationalizing config