"Stupid" persistence layer almost implemented -- refactoring needed.