Pipeline

Please Code review this and prepare it for a merge into the development branch.