Working on Aardvark codegen