lots of work that I forgot to commit