Re-work to use .trees file