Some changes.  Persistance now works.  Manager mostly works