all done! (except for maybe comments).  Now I need to update README.