New MapTree seems OK.
Closes some of the proposed enhancements.