Update from laptop
A messy jumble of changes