Add TODO for initialization phase
Cleanup