major refactor - fails at runtime
more meaningless rfx
microcommit
It runs after a hefty refactor