Finished a round of refactoring of schema and behaviors.  Tested async operations but that didn't work too well.  Needs  investigating.