Started work on the persistance layer