daily progress.  mostly done with refactor