moved everything over to dictionaries