Almost Ready with the New Map Control