lots of progress, but still pretty rough around the edges