Update: wip, incremental (integrate minotaur!)