redid data storage into a dict of lists