done i think. merge and turn in now