Phase 2: initial commit.
Debug messages remvoed.