005.08 Broke out persistence.cpp/.h