All pipeline tests passing -- 1st draft