Code generator still a little broken