changed map to vector
test modified to run test
JustPlayingAround
finished merging
test speed