first crack at moving in updaters.  Tests pass, but super-awkward now.