Intermediate:

 - Initial work-in-progress commit for mapping optimization
Intermediate:

 - Work-in-progress commit with tree search included
Intermediate:

 - More work-in-progress additions / bug-fixes
Enhancement:

 - Final clean-up of work for mapping optimization