forgot a couple things, should be done noe