#9 Working on persistence