middle of refactor
still working through refactor