Working on separating out persistence from core