Added TODO Messages