added map functionality
finished map