Added TODO's for tomorrow