put data from Charlie's lab work into the proper places for the project,
no mods yet other that refactoring Map