Still thinking about the generated code and how it should look.