Partial work on route to persistence