Removed @TODO comments and created issues on GitHub