Update: incremental progress [wip]