Fixed #1 - Turn TODOs into issues