commit #1 of the rehaul