wip end-of-day commit - almost there (untested)