Added TODO comments so I know what's left to finish.