This looks good and is more or less what we need.  We need to figure out a way to sync up our changes to the data types so everyone is certainly caught up in the loop