Almost done getting meta-model editing working