added TODO reminders / changed variable name to be more appropriate