Removed TODO, added everything as issues in github