Added more code generation statements. Still somewhat experimental