More CodeGenerator code; will (fix errors to) compile and test tonight