added ordered dict and dict of lists, tables are next