1/24 backup

Backup for rewrite of TreeManager layout manager