Treedev merge preparation

[elliottfries]

Treedev needs to be prepared to merge and appropriately commented to help those reading the code that was added.