Work in progress

Work in progress, 03/04/2018