To be completed and tested 17/6/19.