Code review
Persistence layer in a done state. Some functionality may come later
Merge