Monstrous commit. Tree building works.