WIP - continuing in refactoring