Hunting TODO's

I'm having so much fun