Move TODOs into a new issue (#3).