move #7 from upcoming to done. add #8 upcoming