Sweeping changes to current pipe setup

- Should fix most of the pipe twirlies and simplify overall setup