WIP: Reworked updater