Begin Persistence + Merge old FrontEnd code