Adds one more general TODO in main controller