Some progress.
Merge branch 'origin/BT'