Lots of progress on update handling