updated TODO's for Tapper