Started on the GUI header files the other day and I can do some cleanup but a lot will need to wait until the generated code is sorted out as I’m not yet comfortable editing the generated code templates on account of not being familiar with the syntax and don’t want to risk messing it up.