Continuing work on data
Fixed pull commit conflicts
Test3 now works
Fixed the storing in the maps so that it is the correct hash key. Also started working on Test7 & debugging Test4
fixing merge conflicts