Incremental work on piping
Getting there... just don't test piping just yet
Progress