Added TODO so I can rember what I want to acheive.