Move TODO's to own file (1)