Code cleanupish
Persist on interval
Merge