Added TODO's for later today