Brian's Data-schema and logic changes
Resolved Merge problems with file callbacks.