Added more implementation in Map class
finished move implementation, still need to test it