in-progress changes from 8/4, committed from the parking lot of dian's shop