Persist, refactor, circle