diff --git a/TensorLib/Basic.lean b/TensorLib/Basic.lean
index cdc57a9..a2b9475 100644
--- a/TensorLib/Basic.lean
+++ b/TensorLib/Basic.lean
@@ -7,3 +7,4 @@ Authors: Jean-Baptiste Tristan, Paul Govereau, Sean McLaughlin
 import TensorLib.Common
 import TensorLib.Dtype
 import TensorLib.Npy
+import TensorLib.Broadcast
diff --git a/TensorLib/Broadcast.lean b/TensorLib/Broadcast.lean
new file mode 100644
index 0000000..c6583b2
--- /dev/null
+++ b/TensorLib/Broadcast.lean
@@ -0,0 +1,106 @@
+/-
+Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Jean-Baptiste Tristan, Paul Govereau, Sean McLaughlin
+-/
+
+import Aesop
+import Batteries.Data.List
+import TensorLib.Common
+
+/-!
+Broadcasting is a convenience and performance trick to allow operations that expect the same
+shaped arguments to work on non-matching arguments.  For example, we would like to be able
+to add 1 to each element of a tensor without building the all-1s tensor in memory.
+It involves applying the following rules to two tensors
+
+1. If the shape of one is smaller than the other, pad the smaller one
+   with 1s until they are the same length
+2. For each pair of numbers at each index, to broadcast either the
+   numbers must be the same, or one of them should be 1. In the later
+   case we replace that shape with the other number
+
+For example, we broadcast (3, 2, 1) (2, 7) to (3, 2, 7).
+
+A: (3, 2, 1)
+B: (2, 7)
+
+Rule 1
+
+A: (3, 2, 1)
+B: (1, 2, 7)
+
+Rule 2
+
+A: (3, 2, 1)
+B: (3, 2, 7)
+
+Rule 2
+
+A: (3, 2, 7)
+B: (3, 2, 7)
+-/
+
+namespace TensorLib
+
+structure Broadcast where
+  left : Shape
+  right : Shape
+  deriving BEq, Repr
+
+namespace Broadcast
+
+-- In broadcasting, we first extend the shorter array by prefixing 1s.
+-- NKI semantics currently suffixes 1s in some cases, so be explicit about
+-- the naming.
+private def oneExtendPrefix (b : Broadcast) : Broadcast :=
+  let n1 := b.left.ndim
+  let n2 := b.right.ndim
+  if n1 <= n2
+  then { b with left := Shape.mk $ List.replicate (n2 - n1) 1 ++ b.left.val }
+  else { b with right := Shape.mk $ List.replicate (n1 - n2) 1 ++ b.right.val }
+
+private theorem oneExtendPrefixLength (b : Broadcast) :
+  let b' := oneExtendPrefix b
+  b'.left.ndim = b'.right.ndim := by
+  cases b
+  rename_i left right
+  simp [oneExtendPrefix]
+  by_cases H : left.ndim <= right.ndim
+  . simp_all [Shape.ndim, H]
+  . simp_all [Shape.ndim, H]
+    aesop (config := { warnOnNonterminal := false })
+    rw [Nat.sub_add_cancel]
+    omega
+
+private def matchPairs (b : Broadcast) : Option Shape :=
+  if b.left.ndim != b.right.ndim then none else
+  let f xy := match xy with
+    | (x, y) =>
+      if x == y then some x
+      else if x == 1 then some y
+      else if y == 1 then some x
+      else none
+  let dims := (b.left.val.zip b.right.val).traverse f
+  dims.map Shape.mk
+
+--! Returns the shape resulting from broadcast the arguments
+def broadcast (b : Broadcast) : Option Shape := matchPairs (oneExtendPrefix b)
+
+--! Whether broadcasting is possible
+def canBroadcast (b : Broadcast) : Bool := (broadcast b).isSome
+
+#guard matchPairs (Broadcast.mk (Shape.mk [1, 2, 3]) (Shape.mk [7, 2, 1])) == some (Shape.mk [7, 2, 3])
+#guard broadcast (Broadcast.mk (Shape.mk [1, 2, 3]) (Shape.mk [7, 7, 9, 2, 1])) == some (Shape.mk [7, 7, 9, 2, 3])
+
+-- todo: add plausible properties when property-based testing settles down in Lean-land
+#guard
+ let x1 := Shape.mk [1, 2, 3]
+ let x2 := Shape.mk [2, 3]
+ let b1 := Broadcast.mk x1 x1
+ let b2 := Broadcast.mk x1 x2
+ oneExtendPrefix b1 == b1 &&
+ broadcast b2 == broadcast b1 &&
+ broadcast b2 == .some (Shape.mk [1, 2, 3])
+
+end Broadcast
diff --git a/TensorLib/Common.lean b/TensorLib/Common.lean
index 8866fd4..4a29f37 100644
--- a/TensorLib/Common.lean
+++ b/TensorLib/Common.lean
@@ -133,11 +133,12 @@ Strides also are empty for scalar arrays.
 ()
 ```
 
--- Shape is independent of the size of the dtype.
+Shape is independent of the size of the dtype.
+TODO: Consider adding Coe instance for List Nat?
 -/
 structure Shape where
   val : List Nat
-deriving Repr, Inhabited
+deriving BEq, Repr, Inhabited
 
 namespace Shape