This evening I managed to get these pretty much finished apart from the bases.

Managed to get to 22.30 without a nap today so I think I have turned a corner.