TODO changes
Merge and fixes