+ Added some tests
+ Save
+ removed map, instead iterating.
+ removed map, instead iterating.