Updates from 8/21... should have comitted early and often