Tracked TODOs

No actual improvements yet, but all TODOs have a #'d issue now