more daily progress.  not quite done yet with refactor