Integration Fixes - TODOs, Default Timeline, Code Review