all done for the most part