Patch 1 (update)

Think this puts me up to date with the remote. But we can check ...