added basic map functionality