Initial CPP commit.