Persistence Module Refactor (incomplete)
Persistence Module Refactor (incomplete)