Just about done. Needs a bit more massaging.