Removed TODOs
Updated CHANGELOG