Re-commit to get tt tensor-logic completed