Added TODO's to code for easier reminders