Jeremy | Added TODO Comments