WIP - break out persistence