beginning refactor/reorg