big persistence commit, unfinished