#9 working on Persistence