partial work for merge
resolved merge conflict
changes to list structure, codegen, naming