Started adding more generic 'pipe' framework