aatree 2016-02-22

This will start slowly, as I no longer understand the code I am migrating. ;D