oops...made lots of progress during the day and forgot to commit periodically...