Todoned some TODO's