Work on generation. Intermediate commit.