Revert "undone workaround code."

This reverts commit 717dbcc24f622558d346035d94ab3ed5d9647e82.
Revert "Revert "undone workaround code.""

This reverts commit 3b8588cda65b44b333bc18f3a4f7a834aceb0af2.
Trying another way to store the fields in Models and Instances.