More Refactoring/Fixes.  Attempt at SuctionPipe