Removed the DataStorage class because I don't have the slightest idea what I'm doing with it.