Started implementing persistence layer