Initial BT client branch commit