More progress on fragments

More refactoring of code to streamline fragments and persistence
functionality.