should work. I can't actually test any of the changes because I can't ge...

...t

the window to pop up. Changes from set of empty locations and dictionary
of entities to dictionary of everything.