Ready for review
Removed TODOs