Move TODO's to own file (2)