Updated TODO to reflect current status