Add skeleton persistence store
Store tweaks
Add assert to engine