Error checking cleaned up, working on persistence file.