working!  still need to look at updated "system" schema changes, + enums