Finished basic map functionality