Revert "WIP"

This reverts commit 5b4742d1ce2e17af694a033fd79ad07013a65ecd.
na - continued refactoring and simplification