Merge changes
Add TODO for logging