Started adapting classes for persistence.