Fixed map and added basic functionality