saving of evaluated definitions

this may change and has not been checked for models with no definitions
temporary modification for speed testing