Add pipelight (in preparation)