Stub persistence is working again
Refactored to better match core style