in the process of refactoring halfway commit
finished
changes