Progress in converting the generated code

....So much stuff meh