integrated DataStorage class into program + some edits in other class to make it work