More TODO's added for tomorrow