A lot of work - more to go