WIP
Functional BTBuilder
Merge WIP
Fix merge problem