ISSUE #20 - Re-write of tree code and picking - Still have to remove old code