Added TODO list item

Welcome aboard!
Merge TODO-fuckery

…again