Subtree spike

Ehren and I rocked this.  Big ups on the subtree fix and now it's time to

:shipit: :gun:

:pizza: