added basic map stuff