lots of work done!
commit before first round of revisions