Add some map analysis. Work in progress.