Starting to add network map functionality