Further work on the new forest level branch.