Additional progress

ping @loganlinn , merging to mine