Lots of changes to get ready for full ETrees...