Working on V2 of Code Generation with some convention-heavy approaches