in-progress rework updates (not modularly committed bc lazy)