Still in process of restoring calculated feature vocabulary functionality.  Kinda works.