Almost done with extra credit