just about to implement the map