Filled out more of the persistence manager, got rid of the singleton pattern