Some code gen tested and working