more hardcore refactoring
more refactor and streamlining
major pipe restructuring