Promote promoteable units during planning
WIP update to unit trees