couple of TODOS for circ. refs