refactoring
refactoring
adding basic map functionalities