Updater code, work in progress...