Added TODOs to GitHub Issues instead