Phase 4 initial commit.