Move todos into issues