Progress on updater, but not yet finished