Started adding persistence layer