Removed TODOs, created an issue