From c64d926e7c2009e6d90d58343fc9d9ad4eb069cf Mon Sep 17 00:00:00 2001
From: jstoobysmith <72603918+jstoobysmith@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:13:52 -0400
Subject: [PATCH] refactor: Lorentz Group etc.

---
 HepLean.lean                                  |   8 +-
 HepLean/SpaceTime/AsSelfAdjointMatrix.lean    |  92 ------
 HepLean/SpaceTime/FourVelocity.lean           | 248 ----------------
 HepLean/SpaceTime/LorentzAlgebra/Basic.lean   | 103 +++----
 HepLean/SpaceTime/LorentzAlgebra/Basis.lean   | 143 +--------
 HepLean/SpaceTime/LorentzGroup/Basic.lean     |   2 +-
 HepLean/SpaceTime/LorentzGroup/Boosts.lean    |  82 +++---
 HepLean/SpaceTime/LorentzGroup/Rotations.lean |  35 ++-
 .../LorentzVector/AsSelfAdjointMatrix.lean    | 145 ++++++++++
 HepLean/SpaceTime/LorentzVector/Basic.lean    |  26 +-
 HepLean/SpaceTime/LorentzVector/NormOne.lean  | 131 ++++++++-
 HepLean/SpaceTime/Metric.lean                 | 273 ------------------
 HepLean/SpaceTime/MinkowskiMetric.lean        |  67 ++++-
 HepLean/SpaceTime/SL2C/Basic.lean             |  23 +-
 scripts/lint-all.sh                           |   1 -
 15 files changed, 488 insertions(+), 891 deletions(-)
 delete mode 100644 HepLean/SpaceTime/AsSelfAdjointMatrix.lean
 delete mode 100644 HepLean/SpaceTime/FourVelocity.lean
 create mode 100644 HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean
 delete mode 100644 HepLean/SpaceTime/Metric.lean

diff --git a/HepLean.lean b/HepLean.lean
index 7940592..96bf060 100644
--- a/HepLean.lean
+++ b/HepLean.lean
@@ -60,10 +60,8 @@ import HepLean.FlavorPhysics.CKMMatrix.StandardParameterization.Basic
 import HepLean.FlavorPhysics.CKMMatrix.StandardParameterization.StandardParameters
 import HepLean.Mathematics.LinearMaps
 import HepLean.Mathematics.SO3.Basic
-import HepLean.SpaceTime.AsSelfAdjointMatrix
 import HepLean.SpaceTime.Basic
 import HepLean.SpaceTime.CliffordAlgebra
-import HepLean.SpaceTime.FourVelocity
 import HepLean.SpaceTime.LorentzAlgebra.Basic
 import HepLean.SpaceTime.LorentzAlgebra.Basis
 import HepLean.SpaceTime.LorentzGroup.Basic
@@ -71,7 +69,11 @@ import HepLean.SpaceTime.LorentzGroup.Boosts
 import HepLean.SpaceTime.LorentzGroup.Orthochronous
 import HepLean.SpaceTime.LorentzGroup.Proper
 import HepLean.SpaceTime.LorentzGroup.Rotations
-import HepLean.SpaceTime.Metric
+import HepLean.SpaceTime.LorentzTensors.Basic
+import HepLean.SpaceTime.LorentzVector.AsSelfAdjointMatrix
+import HepLean.SpaceTime.LorentzVector.Basic
+import HepLean.SpaceTime.LorentzVector.NormOne
+import HepLean.SpaceTime.MinkowskiMetric
 import HepLean.SpaceTime.SL2C.Basic
 import HepLean.StandardModel.Basic
 import HepLean.StandardModel.HiggsBoson.Basic
diff --git a/HepLean/SpaceTime/AsSelfAdjointMatrix.lean b/HepLean/SpaceTime/AsSelfAdjointMatrix.lean
deleted file mode 100644
index 5c65d64..0000000
--- a/HepLean/SpaceTime/AsSelfAdjointMatrix.lean
+++ /dev/null
@@ -1,92 +0,0 @@
-/-
-Copyright (c) 2024 Joseph Tooby-Smith. All rights reserved.
-Released under Apache 2.0 license.
-Authors: Joseph Tooby-Smith
--/
-import HepLean.SpaceTime.Metric
-import Mathlib.LinearAlgebra.Matrix.SpecialLinearGroup
-/-!
-# Spacetime as a self-adjoint matrix
-
-There is a linear equivalence between the vector space of space-time points
-and the vector space of 2×2-complex self-adjoint matrices.
-
-In this file we define this linear equivalence in `toSelfAdjointMatrix`.
-
--/
-namespace SpaceTime
-
-open Matrix
-open MatrixGroups
-open Complex
-
-/-- A 2×2-complex matrix formed from a space-time point. -/
-@[simp]
-def toMatrix (x : SpaceTime) : Matrix (Fin 2) (Fin 2) ℂ :=
-  !![x 0 + x 3, x 1 - x 2 * I; x 1 + x 2 * I, x 0 - x 3]
-
-/-- The matrix `x.toMatrix` for `x ∈ spaceTime` is self adjoint. -/
-lemma toMatrix_isSelfAdjoint (x : SpaceTime) : IsSelfAdjoint x.toMatrix := by
-  rw [isSelfAdjoint_iff, star_eq_conjTranspose, ← Matrix.ext_iff]
-  intro i j
-  fin_cases i <;> fin_cases j <;>
-    simp [toMatrix, conj_ofReal]
-  rfl
-
-/-- A self-adjoint matrix formed from a space-time point. -/
-@[simps!]
-def toSelfAdjointMatrix' (x : SpaceTime) : selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ) :=
-  ⟨x.toMatrix, toMatrix_isSelfAdjoint x⟩
-
-/-- A self-adjoint matrix formed from a space-time point. -/
-@[simp]
-noncomputable def fromSelfAdjointMatrix' (x : selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ)) : SpaceTime :=
-  ![1/2 * (x.1 0 0 + x.1 1 1).re, (x.1 1 0).re, (x.1 1 0).im , (x.1 0 0 - x.1 1 1).re/2]
-
-/-- The linear equivalence between the vector-space `spaceTime` and self-adjoint
-  2×2-complex matrices. -/
-noncomputable def toSelfAdjointMatrix : SpaceTime ≃ₗ[ℝ] selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ) where
-  toFun := toSelfAdjointMatrix'
-  invFun := fromSelfAdjointMatrix'
-  left_inv x := by
-    simp only [fromSelfAdjointMatrix', one_div, toSelfAdjointMatrix'_coe, of_apply, cons_val',
-      cons_val_zero, empty_val', cons_val_fin_one, cons_val_one, head_cons, head_fin_const,
-      add_add_sub_cancel, add_re, ofReal_re, mul_re, I_re, mul_zero, ofReal_im, I_im, mul_one,
-      sub_self, add_zero, add_im, mul_im, zero_add, add_sub_sub_cancel, half_add_self]
-    field_simp [SpaceTime]
-    ext1 x
-    fin_cases x <;> rfl
-  right_inv x := by
-    simp only [toSelfAdjointMatrix', toMatrix, fromSelfAdjointMatrix', one_div, Fin.isValue, add_re,
-      sub_re, cons_val_zero, ofReal_mul, ofReal_inv, ofReal_ofNat, ofReal_add, cons_val_three,
-      Nat.succ_eq_add_one, Nat.reduceAdd, tail_cons, head_cons, ofReal_div, ofReal_sub,
-      cons_val_one, cons_val_two, re_add_im]
-    ext i j
-    fin_cases i <;> fin_cases j <;>
-      field_simp [fromSelfAdjointMatrix', toMatrix, conj_ofReal]
-    exact conj_eq_iff_re.mp (congrArg (fun M => M 0 0) $ selfAdjoint.mem_iff.mp x.2 )
-    have h01 := congrArg (fun M => M 0 1) $ selfAdjoint.mem_iff.mp x.2
-    simp only [Fin.isValue, star_apply, RCLike.star_def] at h01
-    rw [← h01, RCLike.conj_eq_re_sub_im]
-    rfl
-    exact conj_eq_iff_re.mp (congrArg (fun M => M 1 1) $ selfAdjoint.mem_iff.mp x.2 )
-  map_add' x y  := by
-    ext i j : 2
-    simp only [toSelfAdjointMatrix'_coe, add_apply, ofReal_add, of_apply, cons_val', empty_val',
-      cons_val_fin_one, AddSubmonoid.coe_add, AddSubgroup.coe_toAddSubmonoid, Matrix.add_apply]
-    fin_cases i <;> fin_cases j <;> simp <;> ring
-  map_smul' r x := by
-    ext i j : 2
-    simp only [toSelfAdjointMatrix', toMatrix, Fin.isValue, smul_apply, ofReal_mul,
-      RingHom.id_apply]
-    fin_cases i <;> fin_cases j <;>
-      field_simp [fromSelfAdjointMatrix', toMatrix, conj_ofReal, smul_apply]
-       <;> ring
-
-lemma det_eq_ηLin (x : SpaceTime) : det (toSelfAdjointMatrix x).1 = ηLin x x := by
-  simp [toSelfAdjointMatrix, ηLin_expand]
-  ring_nf
-  simp only [Fin.isValue, I_sq, mul_neg, mul_one]
-  ring
-
-end SpaceTime
diff --git a/HepLean/SpaceTime/FourVelocity.lean b/HepLean/SpaceTime/FourVelocity.lean
deleted file mode 100644
index e9fb200..0000000
--- a/HepLean/SpaceTime/FourVelocity.lean
+++ /dev/null
@@ -1,248 +0,0 @@
-/-
-Copyright (c) 2024 Joseph Tooby-Smith. All rights reserved.
-Released under Apache 2.0 license.
-Authors: Joseph Tooby-Smith
--/
-import HepLean.SpaceTime.Metric
-/-!
-# Four velocity
-
-We define
-
-- `PreFourVelocity` : as a space-time element with norm 1.
-- `FourVelocity` : as a space-time element with norm 1 and future pointing.
-
--/
-open SpaceTime
-
-/-- A `spaceTime` vector for which `ηLin x x = 1`. -/
-@[simp]
-def PreFourVelocity : Set SpaceTime :=
-  fun x => ηLin x x = 1
-
-instance : TopologicalSpace PreFourVelocity := by
-  exact instTopologicalSpaceSubtype
-
-namespace PreFourVelocity
-lemma mem_PreFourVelocity_iff {x : SpaceTime} : x ∈ PreFourVelocity ↔ ηLin x x = 1 := by
-  rfl
-
-/-- The negative of a `PreFourVelocity` as a `PreFourVelocity`. -/
-def neg (v : PreFourVelocity) : PreFourVelocity := ⟨-v, by
-  rw [mem_PreFourVelocity_iff]
-  simp only [map_neg, LinearMap.neg_apply, neg_neg]
-  exact v.2 ⟩
-
-lemma zero_sq (v : PreFourVelocity) : v.1 0 ^ 2 = 1 + ‖v.1.space‖ ^ 2  := by
-  rw [time_elm_sq_of_ηLin, v.2]
-
-lemma zero_abs_ge_one (v : PreFourVelocity) : 1 ≤ |v.1 0| := by
-  have h1 := ηLin_leq_time_sq v.1
-  rw [v.2] at h1
-  exact (one_le_sq_iff_one_le_abs _).mp h1
-
-
-lemma zero_abs_gt_norm_space (v : PreFourVelocity) : ‖v.1.space‖ < |v.1 0| := by
-  rw [(abs_norm _).symm, ← @sq_lt_sq, zero_sq]
-  exact lt_one_add (‖(v.1).space‖ ^ 2)
-
-lemma zero_abs_ge_norm_space (v : PreFourVelocity) : ‖v.1.space‖ ≤ |v.1 0| :=
-  le_of_lt (zero_abs_gt_norm_space v)
-
-lemma zero_le_minus_one_or_ge_one (v : PreFourVelocity) : v.1 0 ≤ -1 ∨ 1 ≤ v.1 0 :=
-  le_abs'.mp (zero_abs_ge_one v)
-
-lemma zero_nonpos_iff (v : PreFourVelocity) : v.1 0 ≤ 0 ↔ v.1 0 ≤ - 1 := by
-  apply Iff.intro
-  · intro h
-    cases' zero_le_minus_one_or_ge_one v with h1 h1
-    exact h1
-    linarith
-  · intro h
-    linarith
-
-lemma zero_nonneg_iff (v : PreFourVelocity) : 0 ≤ v.1 0 ↔ 1 ≤ v.1 0 := by
-  apply Iff.intro
-  · intro h
-    cases' zero_le_minus_one_or_ge_one v with h1 h1
-    linarith
-    exact h1
-  · intro h
-    linarith
-
-/-- A `PreFourVelocity` is a `FourVelocity` if its time component is non-negative. -/
-def IsFourVelocity (v : PreFourVelocity) : Prop := 0 ≤ v.1 0
-
-
-lemma IsFourVelocity_abs_zero {v : PreFourVelocity} (hv : IsFourVelocity v) :
-    |v.1 0| = v.1 0 := abs_of_nonneg hv
-
-lemma not_IsFourVelocity_iff (v : PreFourVelocity) : ¬ IsFourVelocity v ↔ v.1 0 ≤ 0 := by
-  rw [IsFourVelocity, not_le]
-  apply Iff.intro
-  exact fun a => le_of_lt a
-  intro h
-  have h1 := (zero_nonpos_iff v).mp h
-  linarith
-
-lemma not_IsFourVelocity_iff_neg {v : PreFourVelocity} : ¬ IsFourVelocity v ↔
-    IsFourVelocity (neg v):= by
-  rw [not_IsFourVelocity_iff, IsFourVelocity]
-  simp only [Fin.isValue, neg]
-  change _ ↔ 0 ≤ - v.1 0
-  exact Iff.symm neg_nonneg
-
-lemma zero_abs_mul_sub_norm_space (v v' : PreFourVelocity) :
-    0 ≤ |v.1 0| * |v'.1 0| - ‖v.1.space‖ * ‖v'.1.space‖ := by
-  apply sub_nonneg.mpr
-  apply mul_le_mul (zero_abs_ge_norm_space v) (zero_abs_ge_norm_space v') ?_ ?_
-  exact norm_nonneg v'.1.space
-  exact abs_nonneg (v.1 0)
-
-
-lemma euclid_norm_IsFourVelocity_IsFourVelocity {v v' : PreFourVelocity}
-    (h : IsFourVelocity v) (h' : IsFourVelocity v') :
-    0 ≤ (v.1 0) * (v'.1 0) + ⟪v.1.space, v'.1.space⟫_ℝ := by
-  apply le_trans (zero_abs_mul_sub_norm_space v v')
-  rw [IsFourVelocity_abs_zero h, IsFourVelocity_abs_zero h', sub_eq_add_neg]
-  apply (add_le_add_iff_left _).mpr
-  rw [@neg_le]
-  apply le_trans (neg_le_abs _ : _ ≤ |⟪(v.1).space, (v'.1).space⟫_ℝ|) ?_
-  exact abs_real_inner_le_norm (v.1).space (v'.1).space
-
-lemma euclid_norm_not_IsFourVelocity_not_IsFourVelocity {v v' : PreFourVelocity}
-    (h : ¬ IsFourVelocity v) (h' : ¬ IsFourVelocity v') :
-    0 ≤ (v.1 0) * (v'.1 0) + ⟪v.1.space, v'.1.space⟫_ℝ := by
-  have h1 := euclid_norm_IsFourVelocity_IsFourVelocity (not_IsFourVelocity_iff_neg.mp h)
-    (not_IsFourVelocity_iff_neg.mp h')
-  apply le_of_le_of_eq h1 ?_
-  simp [neg, Fin.sum_univ_three, neg]
-  repeat rw [show (- v.1) _ = - v.1 _ from rfl]
-  repeat rw [show (- v'.1) _ = - v'.1 _ from rfl]
-  ring
-
-lemma euclid_norm_IsFourVelocity_not_IsFourVelocity {v v' : PreFourVelocity}
-    (h : IsFourVelocity v) (h' : ¬ IsFourVelocity v') :
-    (v.1 0) * (v'.1 0) + ⟪v.1.space, v'.1.space⟫_ℝ ≤ 0 := by
-  rw [show (0 : ℝ) = - 0 from zero_eq_neg.mpr rfl, le_neg]
-  have h1 := euclid_norm_IsFourVelocity_IsFourVelocity h (not_IsFourVelocity_iff_neg.mp h')
-  apply le_of_le_of_eq h1 ?_
-  simp [neg, Fin.sum_univ_three, neg]
-  repeat rw [show (- v'.1) _ = - v'.1 _ from rfl]
-  ring
-
-lemma euclid_norm_not_IsFourVelocity_IsFourVelocity {v v' : PreFourVelocity}
-    (h : ¬ IsFourVelocity v) (h' : IsFourVelocity v') :
-    (v.1 0) * (v'.1 0) + ⟪v.1.space, v'.1.space⟫_ℝ ≤ 0 := by
-  rw [show (0 : ℝ) = - 0 by simp, le_neg]
-  have h1 := euclid_norm_IsFourVelocity_IsFourVelocity h' (not_IsFourVelocity_iff_neg.mp h)
-  apply le_of_le_of_eq h1 ?_
-  simp [neg, Fin.sum_univ_three, neg]
-  repeat rw [show (- v.1) _ = - v.1 _ from rfl]
-  ring
-
-end PreFourVelocity
-
-/-- The set of `PreFourVelocity`'s which are four velocities. -/
-def FourVelocity : Set PreFourVelocity :=
-  fun x => PreFourVelocity.IsFourVelocity x
-
-instance : TopologicalSpace FourVelocity := instTopologicalSpaceSubtype
-
-namespace FourVelocity
-open PreFourVelocity
-
-lemma mem_FourVelocity_iff {x : PreFourVelocity} : x ∈ FourVelocity ↔ 0 ≤ x.1 0 := by
-  rfl
-
-lemma time_comp (x : FourVelocity) : x.1.1 0 = √(1 + ‖x.1.1.space‖ ^ 2) := by
-  symm
-  rw [Real.sqrt_eq_cases]
-  refine Or.inl (And.intro ?_ x.2)
-  rw [← PreFourVelocity.zero_sq x.1, sq]
-
-/-- The `FourVelocity` which has all space components zero. -/
-def zero : FourVelocity := ⟨⟨![1, 0, 0, 0], by
-  rw [mem_PreFourVelocity_iff, ηLin_expand]; simp⟩, by
-  rw [mem_FourVelocity_iff]; simp⟩
-
-
-/-- A continuous path from the zero `FourVelocity` to any other. -/
-noncomputable def pathFromZero (u : FourVelocity) : Path zero u where
-  toFun t := ⟨
-    ⟨![√(1 + t ^ 2 * ‖u.1.1.space‖ ^ 2), t * u.1.1 1, t * u.1.1 2, t * u.1.1 3],
-    by
-      rw [mem_PreFourVelocity_iff, ηLin_expand]
-      simp only [space, Fin.isValue, Matrix.cons_val_zero, Matrix.cons_val_one, Matrix.head_cons,
-        Matrix.cons_val_two, Nat.succ_eq_add_one, Nat.reduceAdd, Matrix.tail_cons,
-        Matrix.cons_val_three]
-      rw [Real.mul_self_sqrt, ← @real_inner_self_eq_norm_sq, @PiLp.inner_apply, Fin.sum_univ_three]
-      simp only [Fin.isValue, Matrix.cons_val_zero, RCLike.inner_apply, conj_trivial,
-        Matrix.cons_val_one, Matrix.head_cons, Matrix.cons_val_two, Nat.succ_eq_add_one,
-        Nat.reduceAdd, Matrix.tail_cons]
-      ring
-      refine Right.add_nonneg (zero_le_one' ℝ) $
-            mul_nonneg (sq_nonneg _) (sq_nonneg _) ⟩,
-    by
-      rw [mem_FourVelocity_iff]
-      exact Real.sqrt_nonneg _⟩
-  continuous_toFun := by
-    refine Continuous.subtype_mk ?_ _
-    refine Continuous.subtype_mk ?_ _
-    apply (continuous_pi_iff).mpr
-    intro i
-    fin_cases i
-      <;> continuity
-  source' := by
-    simp only [Set.Icc.coe_zero, ne_eq, OfNat.ofNat_ne_zero, not_false_eq_true, zero_pow, space,
-      Fin.isValue, zero_mul, add_zero, Real.sqrt_one]
-    rfl
-  target' := by
-    simp only [Set.Icc.coe_one, one_pow, space, Fin.isValue, one_mul]
-    refine SetCoe.ext ?_
-    refine SetCoe.ext ?_
-    funext i
-    fin_cases i
-    simp only [Fin.isValue, Fin.zero_eta, Matrix.cons_val_zero]
-    exact (time_comp _).symm
-    all_goals rfl
-
-lemma isPathConnected_FourVelocity : IsPathConnected (@Set.univ FourVelocity) := by
-  use zero
-  apply And.intro trivial  ?_
-  intro y a
-  use pathFromZero y
-  exact fun _ => a
-
-lemma η_pos (u v : FourVelocity) : 0 < ηLin u v := by
-  refine lt_of_lt_of_le ?_ (ηLin_ge_sub_norm u v)
-  apply sub_pos.mpr
-  refine mul_lt_mul_of_nonneg_of_pos ?_ ?_ ?_ ?_
-  simpa [IsFourVelocity_abs_zero u.2] using zero_abs_gt_norm_space u.1
-  simpa [IsFourVelocity_abs_zero v.2] using zero_abs_ge_norm_space v.1
-  exact norm_nonneg u.1.1.space
-  have h2 := (mem_FourVelocity_iff).mp v.2
-  rw [zero_nonneg_iff] at h2
-  linarith
-
-lemma one_plus_ne_zero (u v : FourVelocity) :  1 + ηLin u v ≠ 0 := by
-  linarith [η_pos u v]
-
-lemma η_continuous (u : SpaceTime) : Continuous (fun (a : FourVelocity) => ηLin u a) := by
-  simp only [ηLin_expand]
-  refine Continuous.add ?_ ?_
-  refine Continuous.add ?_ ?_
-  refine Continuous.add ?_ ?_
-  refine Continuous.comp' (continuous_mul_left _) ?_
-  apply (continuous_pi_iff).mp
-  exact Isometry.continuous fun x1 => congrFun rfl
-  all_goals apply Continuous.neg
-  all_goals apply Continuous.comp' (continuous_mul_left _)
-  all_goals apply (continuous_pi_iff).mp
-  all_goals exact Isometry.continuous fun x1 => congrFun rfl
-
-
-
-
-
-end FourVelocity
diff --git a/HepLean/SpaceTime/LorentzAlgebra/Basic.lean b/HepLean/SpaceTime/LorentzAlgebra/Basic.lean
index 74a3c9b..2375989 100644
--- a/HepLean/SpaceTime/LorentzAlgebra/Basic.lean
+++ b/HepLean/SpaceTime/LorentzAlgebra/Basic.lean
@@ -4,7 +4,7 @@ Released under Apache 2.0 license.
 Authors: Joseph Tooby-Smith
 -/
 import HepLean.SpaceTime.Basic
-import HepLean.SpaceTime.Metric
+import HepLean.SpaceTime.MinkowskiMetric
 import Mathlib.Algebra.Lie.Classical
 /-!
 # The Lorentz Algebra
@@ -12,7 +12,7 @@ import Mathlib.Algebra.Lie.Classical
 We define
 
 - Define `lorentzAlgebra` via `LieAlgebra.Orthogonal.so'` as a subalgebra of
-  `Matrix (Fin 4) (Fin 4) ℝ`.
+  `Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ`.
 - In `mem_iff` prove that a matrix is in the Lorentz algebra if and only if it satisfies the
   condition `Aᵀ * η  = - η * A`.
 
@@ -23,80 +23,71 @@ namespace SpaceTime
 open Matrix
 open TensorProduct
 
-/-- The Lorentz algebra as a subalgebra of `Matrix (Fin 4) (Fin 4) ℝ`.  -/
-def lorentzAlgebra : LieSubalgebra ℝ (Matrix (Fin 4) (Fin 4) ℝ) :=
-  LieSubalgebra.map (Matrix.reindexLieEquiv (@finSumFinEquiv 1 3)).toLieHom
+/-- The Lorentz algebra as a subalgebra of `Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ`.  -/
+def lorentzAlgebra : LieSubalgebra ℝ (Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ) :=
   (LieAlgebra.Orthogonal.so' (Fin 1) (Fin 3) ℝ)
 
 namespace lorentzAlgebra
+open minkowskiMatrix
 
 lemma transpose_eta (A : lorentzAlgebra) :  A.1ᵀ * η  = - η * A.1  := by
-  obtain ⟨B, hB1, hB2⟩ := A.2
-  apply (Equiv.apply_eq_iff_eq
-    (Matrix.reindexAlgEquiv ℝ (@finSumFinEquiv 1 3).symm).toEquiv).mp
-  simp only [Nat.reduceAdd, AlgEquiv.toEquiv_eq_coe, EquivLike.coe_coe, _root_.map_mul,
-    reindexAlgEquiv_apply, ← transpose_reindex, map_neg]
-  rw [(Equiv.apply_eq_iff_eq_symm_apply (reindex finSumFinEquiv.symm finSumFinEquiv.symm)).mpr
-    hB2.symm]
-  erw [η_reindex]
-  simpa [LieAlgebra.Orthogonal.so', IsSkewAdjoint, IsAdjointPair] using hB1
+  have h1 := A.2
+  erw [mem_skewAdjointMatricesLieSubalgebra] at h1
+  simpa [LieAlgebra.Orthogonal.so', IsSkewAdjoint, IsAdjointPair] using h1
 
-lemma mem_of_transpose_eta_eq_eta_mul_self {A : Matrix (Fin 4) (Fin 4) ℝ}
+
+lemma mem_of_transpose_eta_eq_eta_mul_self {A : Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ}
     (h :  Aᵀ * η  = - η * A) : A ∈ lorentzAlgebra := by
-  simp only [lorentzAlgebra, Nat.reduceAdd, LieSubalgebra.mem_map]
-  use (Matrix.reindexLieEquiv (@finSumFinEquiv 1 3)).symm A
-  apply And.intro
-  · have h1 := (Equiv.apply_eq_iff_eq
-      (Matrix.reindexAlgEquiv ℝ (@finSumFinEquiv 1 3).symm).toEquiv).mpr h
-    erw [Matrix.reindexAlgEquiv_mul] at h1
-    simp only [Nat.reduceAdd, reindexAlgEquiv_apply, Equiv.symm_symm, AlgEquiv.toEquiv_eq_coe,
-      EquivLike.coe_coe, map_neg, _root_.map_mul] at h1
-    erw [η_reindex] at h1
-    simpa  [Nat.reduceAdd, reindexLieEquiv_symm, reindexLieEquiv_apply,
-      LieAlgebra.Orthogonal.so', mem_skewAdjointMatricesLieSubalgebra,
-      mem_skewAdjointMatricesSubmodule, IsSkewAdjoint, IsAdjointPair, mul_neg] using h1
-  · exact LieEquiv.apply_symm_apply (reindexLieEquiv finSumFinEquiv) _
+  erw [mem_skewAdjointMatricesLieSubalgebra]
+  simpa [LieAlgebra.Orthogonal.so', IsSkewAdjoint, IsAdjointPair] using h
 
-
-lemma mem_iff {A : Matrix (Fin 4) (Fin 4) ℝ} : A ∈ lorentzAlgebra ↔ Aᵀ * η  = - η * A :=
+lemma mem_iff {A : Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ} :
+  A ∈ lorentzAlgebra ↔ Aᵀ * η  = - η * A :=
   Iff.intro (fun h => transpose_eta ⟨A, h⟩) (fun h => mem_of_transpose_eta_eq_eta_mul_self h)
 
-lemma mem_iff'  (A : Matrix (Fin 4) (Fin 4) ℝ) : A ∈ lorentzAlgebra ↔ A  = - η * Aᵀ * η := by
-  apply Iff.intro
-  intro h
-  simp_rw [mul_assoc, mem_iff.mp h, neg_mul, mul_neg, ← mul_assoc, η_sq, one_mul, neg_neg]
-  intro h
+lemma mem_iff'  (A : Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ) :
+    A ∈ lorentzAlgebra ↔ A  = - η * Aᵀ * η := by
   rw [mem_iff]
-  nth_rewrite 2 [h]
-  simp [← mul_assoc, η_sq]
+  refine Iff.intro (fun h => ?_) (fun h => ?_)
+  · trans -η * (Aᵀ * η)
+    rw [h]
+    trans (η * η) * A
+    rw [minkowskiMatrix.sq]
+    all_goals noncomm_ring
+  · nth_rewrite 2 [h]
+    trans  (η * η) * Aᵀ * η
+    rw [minkowskiMatrix.sq]
+    all_goals noncomm_ring
 
-lemma diag_comp (Λ : lorentzAlgebra) (μ : Fin 4) : Λ.1 μ μ = 0 := by
+
+lemma diag_comp (Λ : lorentzAlgebra) (μ : Fin 1 ⊕ Fin 3) : Λ.1 μ μ = 0 := by
   have h := congrArg (fun M ↦ M μ μ) $ mem_iff.mp Λ.2
-  simp at h
-  fin_cases μ <;>
-    rw [η_mul, mul_η, η_explicit] at h
-    <;> simpa using h
+  simp only [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal, mul_diagonal,
+    transpose_apply, diagonal_neg, diagonal_mul, neg_mul] at h
+  rcases μ with μ | μ
+  simpa using h
+  simpa using h
+
+
+
+lemma time_comps (Λ : lorentzAlgebra) (i : Fin 3) :
+    Λ.1 (Sum.inr i) (Sum.inl 0) = Λ.1 (Sum.inl 0) (Sum.inr i) := by
+  simpa only [Fin.isValue, minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal, mul_diagonal,
+    transpose_apply, Sum.elim_inr, mul_neg, mul_one, diagonal_neg, diagonal_mul, Sum.elim_inl,
+    neg_mul, one_mul, neg_inj] using congrArg (fun M ↦ M (Sum.inl 0) (Sum.inr i)) $ mem_iff.mp Λ.2
 
-lemma time_comps (Λ : lorentzAlgebra) (i : Fin 3) : Λ.1 i.succ 0 = Λ.1 0 i.succ := by
-  have h := congrArg (fun M ↦ M 0 i.succ) $ mem_iff.mp Λ.2
-  simp at h
-  fin_cases i <;>
-    rw [η_mul, mul_η, η_explicit] at h <;>
-    simpa using h
 
 lemma space_comps (Λ : lorentzAlgebra) (i j : Fin 3) :
-    Λ.1 i.succ j.succ = - Λ.1 j.succ i.succ := by
-  have h := congrArg (fun M ↦ M i.succ j.succ) $ mem_iff.mp Λ.2
-  simp at h
-  fin_cases i <;> fin_cases j <;>
-    rw [η_mul, mul_η, η_explicit] at h <;>
-    simpa using h.symm
+    Λ.1 (Sum.inr i) (Sum.inr j) = - Λ.1 (Sum.inr j) (Sum.inr i) := by
+  simpa only [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal, diagonal_neg, diagonal_mul,
+    Sum.elim_inr, neg_neg, one_mul, mul_diagonal, transpose_apply, mul_neg, mul_one] using
+    (congrArg (fun M ↦ M (Sum.inr i) (Sum.inr j)) $ mem_iff.mp Λ.2).symm
 
 
 end lorentzAlgebra
 
 @[simps!]
-instance spaceTimeAsLieRingModule : LieRingModule lorentzAlgebra SpaceTime where
+instance lorentzVectorAsLieRingModule : LieRingModule lorentzAlgebra (LorentzVector 3) where
   bracket Λ x :=  Λ.1.mulVec  x
   add_lie Λ1 Λ2 x := by
     simp [add_mulVec]
@@ -107,7 +98,7 @@ instance spaceTimeAsLieRingModule : LieRingModule lorentzAlgebra SpaceTime where
     simp [mulVec_add, Bracket.bracket, sub_mulVec]
 
 @[simps!]
-instance spaceTimeAsLieModule : LieModule ℝ lorentzAlgebra SpaceTime where
+instance spaceTimeAsLieModule : LieModule ℝ lorentzAlgebra (LorentzVector 3) where
   smul_lie r Λ x  := by
     simp [Bracket.bracket, smul_mulVec_assoc]
   lie_smul r Λ x := by
diff --git a/HepLean/SpaceTime/LorentzAlgebra/Basis.lean b/HepLean/SpaceTime/LorentzAlgebra/Basis.lean
index 7b08f25..45f9f44 100644
--- a/HepLean/SpaceTime/LorentzAlgebra/Basis.lean
+++ b/HepLean/SpaceTime/LorentzAlgebra/Basis.lean
@@ -7,142 +7,11 @@ import HepLean.SpaceTime.LorentzAlgebra.Basic
 /-!
 # Basis of the Lorentz Algebra
 
-We define the standard basis of the Lorentz group.
+This file is currently a stub.
+
+Old commits contained code here, however this has not being ported forward.
+
+This file is waiting for Lorentz Tensors to be done formally, before
+it can be completed.
 
 -/
-
-namespace SpaceTime
-
-namespace lorentzAlgebra
-open Matrix
-
-/-- The matrices which form the basis of the Lorentz algebra. -/
-@[simp]
-def σMat (μ ν : Fin 4) : Matrix (Fin 4) (Fin 4) ℝ := fun ρ δ ↦
-  η_[μ]_[δ] * η^[ρ]_[ν] - η^[ρ]_[μ] * η_[ν]_[δ]
-
-lemma σMat_in_lorentzAlgebra (μ ν : Fin 4) : σMat μ ν ∈ lorentzAlgebra := by
-  rw [mem_iff]
-  funext ρ δ
-  rw [Matrix.neg_mul, Matrix.neg_apply, η_mul, mul_η, transpose_apply]
-  apply Eq.trans ?_ (by ring :
-    ((η^[ρ]_[μ] * η_[ρ]_[ρ]) * η_[ν]_[δ] - η_[μ]_[δ] * (η^[ρ]_[ν] *  η_[ρ]_[ρ])) =
-    -(η_[ρ]_[ρ] * (η_[μ]_[δ] * η^[ρ]_[ν] - η^[ρ]_[μ] * η_[ν]_[δ] )))
-  apply Eq.trans (by ring : (η_[μ]_[ρ] * η^[δ]_[ν] - η^[δ]_[μ] * η_[ν]_[ρ]) * η_[δ]_[δ]
-    = (- (η^[δ]_[μ] * η_[δ]_[δ]) * η_[ν]_[ρ] + η_[μ]_[ρ] * (η^[δ]_[ν]  * η_[δ]_[δ])))
-  rw [η_mul_self, η_mul_self, η_mul_self, η_mul_self]
-  ring
-
-/-- Elements of the Lorentz algebra which form a basis thereof. -/
-@[simps!]
-def σ (μ ν : Fin 4) : lorentzAlgebra := ⟨σMat μ ν, σMat_in_lorentzAlgebra μ ν⟩
-
-lemma σ_anti_symm (μ ν : Fin 4) : σ μ ν = - σ ν μ := by
-  refine SetCoe.ext ?_
-  funext ρ δ
-  simp only [σ_coe, σMat, NegMemClass.coe_neg, neg_apply, neg_sub]
-  ring
-
-lemma σMat_mul (α β γ δ  a b: Fin 4) :
-    (σMat α β * σMat γ δ) a b =
-    η^[a]_[α] * (η_[δ]_[b] * η_[β]_[γ] - η_[γ]_[b] * η_[β]_[δ])
-    - η^[a]_[β] * (η_[δ]_[b] * η_[α]_[γ]- η_[γ]_[b] * η_[α]_[δ]) := by
-  rw [Matrix.mul_apply]
-  simp only [σMat]
-  trans (η^[a]_[α] * η_[δ]_[b]) * ∑ x, η^[x]_[γ] * η_[β]_[x]
-    - (η^[a]_[α] * η_[γ]_[b]) * ∑ x, η^[x]_[δ] * η_[β]_[x]
-    - (η^[a]_[β] *  η_[δ]_[b]) * ∑ x, η^[x]_[γ] * η_[α]_[x]
-    + (η^[a]_[β] * η_[γ]_[b]) * ∑ x, η^[x]_[δ] * η_[α]_[x]
-  repeat rw [Fin.sum_univ_four]
-  ring
-  rw [η_contract_self', η_contract_self', η_contract_self', η_contract_self']
-  ring
-
-lemma σ_comm (α β γ δ : Fin 4) :
-    ⁅σ α β , σ γ δ⁆ =
-    η_[α]_[δ] • σ γ β + η_[α]_[γ] • σ β δ + η_[β]_[δ] • σ α γ + η_[β]_[γ] • σ δ α := by
-  refine SetCoe.ext ?_
-  change σMat α β * σ γ δ -  σ γ δ * σ α β = _
-  funext a b
-  simp only [σ_coe, sub_apply, AddSubmonoid.coe_add, Submodule.coe_toAddSubmonoid,
-    Submodule.coe_smul_of_tower, Matrix.add_apply, Matrix.smul_apply, σMat, smul_eq_mul]
-  rw [σMat_mul, σMat_mul, η_symmetric α γ, η_symmetric α δ, η_symmetric β γ, η_symmetric β δ]
-  ring
-
-lemma eq_span_σ (Λ : lorentzAlgebra) :
-    Λ = Λ.1 0 1 • σ 0 1 + Λ.1 0 2 • σ 0 2 + Λ.1 0 3 • σ 0 3 +
-      Λ.1 1 2 • σ 1 2 + Λ.1 1 3 • σ 1 3 + Λ.1 2 3 • σ 2 3 := by
-  apply SetCoe.ext ?_
-  funext a b
-  fin_cases a <;> fin_cases b <;>
-    simp only [Fin.zero_eta, Fin.isValue, Fin.mk_one, Fin.reduceFinMk, AddSubmonoid.coe_add,
-     Submodule.coe_smul_of_tower, σ_coe,
-     Matrix.add_apply, Matrix.smul_apply, σMat, ηUpDown, ne_eq, zero_ne_one, not_false_eq_true,
-     one_apply_ne, η_explicit, of_apply, cons_val_zero,
-     mul_zero, one_apply_eq, mul_one, sub_neg_eq_add,
-     zero_add, smul_eq_mul, Fin.reduceEq, cons_val_one, vecHead, vecTail,
-     Nat.reduceAdd, Function.comp_apply, Fin.succ_zero_eq_one, sub_self, add_zero, cons_val_two,
-     cons_val_three, Fin.succ_one_eq_two, mul_neg, neg_zero, sub_zero]
-  · exact diag_comp Λ 0
-  · exact time_comps Λ 0
-  · exact diag_comp Λ 1
-  · exact time_comps Λ 1
-  · exact space_comps Λ 1 0
-  · exact diag_comp Λ 2
-  · exact time_comps Λ 2
-  · exact space_comps Λ 2 0
-  · exact space_comps Λ 2 1
-  · exact diag_comp Λ 3
-
-/-- The coordinate map for the basis formed by the matrices `σ`. -/
-@[simps!]
-noncomputable def σCoordinateMap : lorentzAlgebra ≃ₗ[ℝ] Fin 6 →₀ ℝ where
-  toFun Λ := Finsupp.equivFunOnFinite.invFun
-    fun i => match i with
-    | 0 => Λ.1 0 1
-    | 1 => Λ.1 0 2
-    | 2 => Λ.1 0 3
-    | 3 => Λ.1 1 2
-    | 4 => Λ.1 1 3
-    | 5 => Λ.1 2 3
-  map_add' S T := by
-    ext i
-    fin_cases i <;> rfl
-  map_smul' c S := by
-    ext i
-    fin_cases i <;> rfl
-  invFun c := c 0 • σ 0 1 + c 1 • σ 0 2 + c 2 • σ 0 3 +
-      c 3 • σ 1 2 + c 4 • σ 1 3 + c 5 • σ 2 3
-  left_inv Λ := by
-    simp only [Fin.isValue, Equiv.invFun_as_coe, Finsupp.equivFunOnFinite_symm_apply_toFun]
-    exact (eq_span_σ Λ).symm
-  right_inv c := by
-    ext i
-    fin_cases i <;> simp only  [Fin.isValue, Set.Finite.toFinset_setOf, ne_eq, Finsupp.coe_mk,
-    Fin.zero_eta, Fin.isValue, Fin.mk_one, Fin.reduceFinMk, AddSubmonoid.coe_add,
-     Submodule.coe_toAddSubmonoid, Submodule.coe_smul_of_tower, σ_coe,
-     Matrix.add_apply, Matrix.smul_apply, σMat, ηUpDown, ne_eq, zero_ne_one, not_false_eq_true,
-     one_apply_ne, η_explicit, of_apply, cons_val', cons_val_zero, empty_val',
-     cons_val_fin_one, vecCons_const, mul_zero, one_apply_eq, mul_one, sub_neg_eq_add,
-     zero_add, smul_eq_mul, Fin.reduceEq, cons_val_one, vecHead, vecTail, Nat.succ_eq_add_one,
-     Nat.reduceAdd, Function.comp_apply, Fin.succ_zero_eq_one, sub_self, add_zero, cons_val_two,
-     cons_val_three, Fin.succ_one_eq_two, mul_neg, neg_zero, sub_zero, Finsupp.equivFunOnFinite]
-
-/-- The basis formed by the matrices `σ`. -/
-@[simps! repr_apply_support_val repr_apply_toFun]
-noncomputable def σBasis : Basis (Fin 6) ℝ lorentzAlgebra where
-  repr := σCoordinateMap
-
-instance : Module.Finite ℝ lorentzAlgebra :=
-   Module.Finite.of_basis σBasis
-
-/-- The Lorentz algebra is 6-dimensional. -/
-theorem finrank_eq_six : FiniteDimensional.finrank ℝ lorentzAlgebra = 6 := by
-  have h  :=  Module.mk_finrank_eq_card_basis σBasis
-  simp only [finrank_eq_rank, Cardinal.mk_fintype, Fintype.card_fin, Nat.cast_ofNat] at h
-  exact FiniteDimensional.finrank_eq_of_rank_eq h
-
-
-end lorentzAlgebra
-
-end SpaceTime
diff --git a/HepLean/SpaceTime/LorentzGroup/Basic.lean b/HepLean/SpaceTime/LorentzGroup/Basic.lean
index 446a3b9..9975707 100644
--- a/HepLean/SpaceTime/LorentzGroup/Basic.lean
+++ b/HepLean/SpaceTime/LorentzGroup/Basic.lean
@@ -4,7 +4,7 @@ Released under Apache 2.0 license.
 Authors: Joseph Tooby-Smith
 -/
 import HepLean.SpaceTime.MinkowskiMetric
-import HepLean.SpaceTime.AsSelfAdjointMatrix
+import HepLean.SpaceTime.LorentzVector.AsSelfAdjointMatrix
 import HepLean.SpaceTime.LorentzVector.NormOne
 /-!
 # The Lorentz Group
diff --git a/HepLean/SpaceTime/LorentzGroup/Boosts.lean b/HepLean/SpaceTime/LorentzGroup/Boosts.lean
index a11246a..38e46e6 100644
--- a/HepLean/SpaceTime/LorentzGroup/Boosts.lean
+++ b/HepLean/SpaceTime/LorentzGroup/Boosts.lean
@@ -68,7 +68,7 @@ def genBoostAux₂ (u v : FuturePointing d) : LorentzVector d →ₗ[ℝ] Lorent
 
 /-- An generalised boost. This is a Lorentz transformation which takes the four velocity `u`
 to `v`. -/
-def genBoost (u v : FourVelocity) : SpaceTime →ₗ[ℝ] SpaceTime :=
+def genBoost (u v : FuturePointing d) : LorentzVector d →ₗ[ℝ] LorentzVector d :=
   LinearMap.id + genBoostAux₁ u v + genBoostAux₂ u v
 
 namespace genBoost
@@ -77,7 +77,7 @@ namespace genBoost
   This lemma states that for a given four-velocity `u`, the general boost
   transformation `genBoost u u` is equal to the identity linear map `LinearMap.id`.
 -/
-lemma self (u : FourVelocity) : genBoost u u = LinearMap.id := by
+lemma self (u : FuturePointing d) : genBoost u u = LinearMap.id := by
   ext x
   simp [genBoost]
   rw [add_assoc]
@@ -94,84 +94,88 @@ lemma self (u : FourVelocity) : genBoost u u = LinearMap.id := by
   rfl
 
 /-- A generalised boost as a matrix. -/
-def toMatrix (u v : FourVelocity) : Matrix (Fin 4) (Fin 4) ℝ :=
-  LinearMap.toMatrix stdBasis stdBasis (genBoost u v)
+def toMatrix (u v : FuturePointing d) : Matrix (Fin 1 ⊕ Fin d) (Fin 1 ⊕ Fin d) ℝ :=
+  LinearMap.toMatrix LorentzVector.stdBasis LorentzVector.stdBasis (genBoost u v)
 
-lemma toMatrix_mulVec (u v : FourVelocity) (x : SpaceTime) :
+lemma toMatrix_mulVec (u v : FuturePointing d) (x : LorentzVector d) :
     (toMatrix u v).mulVec x = genBoost u v x :=
-  LinearMap.toMatrix_mulVec_repr stdBasis stdBasis (genBoost u v) x
+  LinearMap.toMatrix_mulVec_repr LorentzVector.stdBasis LorentzVector.stdBasis (genBoost u v) x
 
-lemma toMatrix_apply (u v : FourVelocity) (i j : Fin 4) :
-    (toMatrix u v) i j =
-     η i i * (ηLin (stdBasis i) (stdBasis j) + 2 * ηLin (stdBasis j) u * ηLin (stdBasis i) v -
-    ηLin (stdBasis i) (u + v) * ηLin (stdBasis j) (u + v) / (1 + ηLin u v)) := by
-  rw [ηLin_matrix_stdBasis' j i (toMatrix u v), toMatrix_mulVec]
+open minkowskiMatrix LorentzVector in
+@[simp]
+lemma toMatrix_apply (u v : FuturePointing d) (μ ν  : Fin 1 ⊕ Fin d) :
+    (toMatrix u v) μ ν = η μ μ  * (⟪e μ, e ν⟫ₘ + 2 * ⟪e ν, u⟫ₘ * ⟪e μ, v⟫ₘ
+    - ⟪e μ, u + v⟫ₘ * ⟪e ν, u + v⟫ₘ / (1 + ⟪u, v.1.1⟫ₘ)) := by
+  rw [matrix_apply_stdBasis (toMatrix u v) μ ν, toMatrix_mulVec]
   simp only [genBoost, genBoostAux₁, genBoostAux₂, map_add, smul_add, neg_smul, LinearMap.add_apply,
-    LinearMap.id_apply, LinearMap.coe_mk, AddHom.coe_mk, LinearMapClass.map_smul, smul_eq_mul,
-    map_neg, mul_eq_mul_left_iff]
-  apply Or.inl
-  ring
+    LinearMap.id_apply, LinearMap.coe_mk, AddHom.coe_mk, basis_left, map_smul, smul_eq_mul, map_neg,
+    mul_eq_mul_left_iff]
+  have h1 := FuturePointing.one_add_metric_non_zero u v
+  field_simp
+  ring_nf
+  simp
 
-lemma toMatrix_continuous (u : FourVelocity) : Continuous (toMatrix u) := by
+open minkowskiMatrix LorentzVector in
+lemma toMatrix_continuous (u : FuturePointing d) : Continuous (toMatrix u) := by
   refine continuous_matrix ?_
   intro i j
   simp only [toMatrix_apply]
   refine Continuous.comp' (continuous_mul_left (η i i)) ?hf
   refine Continuous.sub ?_ ?_
-  refine Continuous.comp' (continuous_add_left ((ηLin (stdBasis i)) (stdBasis j))) ?_
-  refine Continuous.comp' (continuous_mul_left (2 * (ηLin (stdBasis j)) ↑u)) ?_
-  exact η_continuous _
+  refine Continuous.comp' (continuous_add_left ⟪e i, e j⟫ₘ) ?_
+  refine Continuous.comp' (continuous_mul_left (2 * ⟪e j, u⟫ₘ)) ?_
+  exact FuturePointing.metric_continuous _
   refine Continuous.mul ?_ ?_
   refine Continuous.mul ?_ ?_
-  simp only [(ηLin _).map_add]
+  simp only [(minkowskiMetric _).map_add]
   refine Continuous.comp' ?_ ?_
-  exact continuous_add_left ((ηLin (stdBasis i)) ↑u)
-  exact η_continuous _
-  simp only [(ηLin _).map_add]
+  exact continuous_add_left ((minkowskiMetric (stdBasis i)) ↑u)
+  exact FuturePointing.metric_continuous _
+  simp only [(minkowskiMetric _).map_add]
   refine Continuous.comp' ?_ ?_
   exact continuous_add_left _
-  exact η_continuous _
+  exact FuturePointing.metric_continuous _
   refine Continuous.inv₀ ?_ ?_
   refine Continuous.comp' (continuous_add_left 1) ?_
-  exact η_continuous _
-  exact fun x => one_plus_ne_zero u x
+  exact FuturePointing.metric_continuous _
+  exact fun x => FuturePointing.one_add_metric_non_zero u x
 
 
-lemma toMatrix_PreservesηLin (u v : FourVelocity) : PreservesηLin (toMatrix u v) := by
+lemma toMatrix_in_lorentzGroup (u v : FuturePointing d) : (toMatrix u v) ∈ LorentzGroup d:= by
   intro x y
   rw [toMatrix_mulVec, toMatrix_mulVec, genBoost, genBoostAux₁, genBoostAux₂]
-  have h1 : (1 + (ηLin ↑u) ↑v) ≠ 0 := one_plus_ne_zero u v
+  have h1 : (1 + (minkowskiMetric ↑u) ↑v.1.1) ≠ 0 := FuturePointing.one_add_metric_non_zero u v
   simp only [map_add, smul_add, neg_smul, LinearMap.add_apply, LinearMap.id_coe,
     id_eq, LinearMap.coe_mk, AddHom.coe_mk, LinearMapClass.map_smul, map_neg, LinearMap.smul_apply,
     smul_eq_mul, LinearMap.neg_apply]
   field_simp
-  rw [u.1.2, v.1.2, ηLin_symm v u, ηLin_symm u y, ηLin_symm v y]
+  rw [u.1.2, v.1.2, minkowskiMetric.symm v.1.1 u, minkowskiMetric.symm u y,
+     minkowskiMetric.symm v y]
   ring
 
 /-- A generalised boost as an element of the Lorentz Group. -/
-def toLorentz (u v : FourVelocity) : LorentzGroup :=
-  ⟨toMatrix u v, toMatrix_PreservesηLin u v⟩
+def toLorentz (u v : FuturePointing d) : LorentzGroup d :=
+  ⟨toMatrix u v, toMatrix_in_lorentzGroup u v⟩
 
-lemma toLorentz_continuous (u : FourVelocity) : Continuous (toLorentz u) := by
-  refine Continuous.subtype_mk ?_ (fun x => toMatrix_PreservesηLin u x)
+lemma toLorentz_continuous (u : FuturePointing d) : Continuous (toLorentz u) := by
+  refine Continuous.subtype_mk ?_ (fun x => toMatrix_in_lorentzGroup u x)
   exact toMatrix_continuous u
 
 
-
-lemma toLorentz_joined_to_1 (u v : FourVelocity) : Joined 1 (toLorentz u v) := by
-  obtain ⟨f, _⟩ := isPathConnected_FourVelocity.joinedIn u trivial v trivial
+lemma toLorentz_joined_to_1 (u v : FuturePointing d) : Joined 1 (toLorentz u v) := by
+  obtain ⟨f, _⟩ := FuturePointing.isPathConnected.joinedIn u trivial v trivial
   use ContinuousMap.comp ⟨toLorentz u, toLorentz_continuous u⟩ f
   · simp only [ContinuousMap.toFun_eq_coe, ContinuousMap.comp_apply, ContinuousMap.coe_coe,
     Path.source, ContinuousMap.coe_mk]
     rw [@Subtype.ext_iff, toLorentz]
-    simp [PreservesηLin.liftGL, toMatrix, self u]
+    simp [toMatrix, self u]
   · simp
 
-lemma toLorentz_in_connected_component_1 (u v : FourVelocity) :
+lemma toLorentz_in_connected_component_1 (u v : FuturePointing d) :
     toLorentz u v ∈ connectedComponent 1 :=
   pathComponent_subset_component _ (toLorentz_joined_to_1 u v)
 
-lemma isProper (u v : FourVelocity) : IsProper (toLorentz u v) :=
+lemma isProper (u v : FuturePointing d) : IsProper (toLorentz u v) :=
   (isProper_on_connected_component (toLorentz_in_connected_component_1 u v)).mp id_IsProper
 
 end genBoost
diff --git a/HepLean/SpaceTime/LorentzGroup/Rotations.lean b/HepLean/SpaceTime/LorentzGroup/Rotations.lean
index 605d025..5172b3f 100644
--- a/HepLean/SpaceTime/LorentzGroup/Rotations.lean
+++ b/HepLean/SpaceTime/LorentzGroup/Rotations.lean
@@ -9,50 +9,53 @@ import Mathlib.Topology.Constructions
 /-!
 # Rotations
 
+This file describes the embedding of `SO(3)` into `LorentzGroup 3`.
+
+## TODO
+
+Generalize to arbitrary dimensions.
+
 -/
 noncomputable section
-namespace SpaceTime
 
-namespace lorentzGroup
+namespace LorentzGroup
 open GroupTheory
 
 /-- Given a element of `SO(3)` the matrix corresponding to a space-time rotation. -/
 @[simp]
-def SO3ToMatrix (A : SO(3)) : Matrix (Fin 4) (Fin 4) ℝ :=
-  Matrix.reindex finSumFinEquiv finSumFinEquiv (Matrix.fromBlocks 1 0 0 A.1)
+def SO3ToMatrix (A : SO(3)) : Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ :=
+  (Matrix.fromBlocks 1 0 0 A.1)
 
-lemma SO3ToMatrix_PreservesηLin (A : SO(3)) : PreservesηLin $ SO3ToMatrix A  := by
-  rw [PreservesηLin.iff_matrix]
-  simp only [η_block, Nat.reduceAdd, Matrix.reindex_apply, SO3ToMatrix, Matrix.transpose_submatrix,
+lemma SO3ToMatrix_in_LorentzGroup (A : SO(3)) : SO3ToMatrix A ∈ LorentzGroup 3 := by
+  rw [LorentzGroup.mem_iff_dual_mul_self]
+  simp only [minkowskiMetric.dual, minkowskiMatrix.as_block, SO3ToMatrix,
     Matrix.fromBlocks_transpose, Matrix.transpose_one, Matrix.transpose_zero,
-    Matrix.submatrix_mul_equiv, Matrix.fromBlocks_multiply, mul_one, Matrix.mul_zero, add_zero,
-    Matrix.zero_mul, Matrix.mul_one, neg_mul, one_mul, zero_add, Matrix.mul_neg, neg_zero, mul_neg,
-    neg_neg, Matrix.mul_eq_one_comm.mpr A.2.2, Matrix.fromBlocks_one, Matrix.submatrix_one_equiv]
+    Matrix.fromBlocks_multiply, mul_one, Matrix.mul_zero, add_zero, Matrix.zero_mul, Matrix.mul_one,
+    neg_mul, one_mul, zero_add, Matrix.mul_neg, neg_zero, mul_neg, neg_neg,
+    Matrix.mul_eq_one_comm.mpr A.2.2, Matrix.fromBlocks_one]
 
 lemma SO3ToMatrix_injective : Function.Injective SO3ToMatrix := by
   intro A B h
   erw [Equiv.apply_eq_iff_eq] at h
   have h1 := congrArg Matrix.toBlocks₂₂ h
-  rw [Matrix.toBlocks_fromBlocks₂₂, Matrix.toBlocks_fromBlocks₂₂] at h1
+  erw [Matrix.toBlocks_fromBlocks₂₂, Matrix.toBlocks_fromBlocks₂₂] at h1
   apply Subtype.eq
   exact h1
 
 /-- Given a element of `SO(3)` the element of the Lorentz group corresponding to a
 space-time rotation. -/
-def SO3ToLorentz : SO(3) →* 𝓛 where
-  toFun A := ⟨SO3ToMatrix A, SO3ToMatrix_PreservesηLin A⟩
+def SO3ToLorentz : SO(3) →* LorentzGroup 3 where
+  toFun A := ⟨SO3ToMatrix A, SO3ToMatrix_in_LorentzGroup A⟩
   map_one' := by
     apply Subtype.eq
     simp only [SO3ToMatrix, Nat.reduceAdd, Matrix.reindex_apply, lorentzGroupIsGroup_one_coe]
     erw [Matrix.fromBlocks_one]
-    exact Matrix.submatrix_one_equiv finSumFinEquiv.symm
   map_mul' A B := by
     apply Subtype.eq
     simp [Matrix.fromBlocks_multiply]
 
 
-end lorentzGroup
+end LorentzGroup
 
 
-end SpaceTime
 end
diff --git a/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean b/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean
new file mode 100644
index 0000000..6fbdcb5
--- /dev/null
+++ b/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean
@@ -0,0 +1,145 @@
+/-
+Copyright (c) 2024 Joseph Tooby-Smith. All rights reserved.
+Released under Apache 2.0 license.
+Authors: Joseph Tooby-Smith
+-/
+import HepLean.SpaceTime.MinkowskiMetric
+import Mathlib.LinearAlgebra.Matrix.SpecialLinearGroup
+/-!
+# Spacetime as a self-adjoint matrix
+
+There is a linear equivalence between the vector space of space-time points
+and the vector space of 2×2-complex self-adjoint matrices.
+
+In this file we define this linear equivalence in `toSelfAdjointMatrix`.
+
+## TODO
+
+If possible generalize to arbitrary dimensions.
+
+-/
+namespace SpaceTime
+
+open Matrix
+open MatrixGroups
+open Complex
+
+/-- A 2×2-complex matrix formed from a space-time point. -/
+@[simp]
+def toMatrix (x : LorentzVector 3) : Matrix (Fin 2) (Fin 2) ℂ :=
+  !![x.time + x.space 2, x.space 0 - x.space 1 * I; x.space 0 + x.space 1 * I, x.time - x.space 2]
+
+/-- The matrix `x.toMatrix` for `x ∈ spaceTime` is self adjoint. -/
+lemma toMatrix_isSelfAdjoint (x : LorentzVector 3) : IsSelfAdjoint (toMatrix x) := by
+  rw [isSelfAdjoint_iff, star_eq_conjTranspose, ← Matrix.ext_iff]
+  intro i j
+  fin_cases i <;> fin_cases j <;>
+    simp [toMatrix, conj_ofReal]
+  rfl
+
+/-- A self-adjoint matrix formed from a space-time point. -/
+@[simps!]
+def toSelfAdjointMatrix' (x : LorentzVector 3) : selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ) :=
+  ⟨toMatrix x, toMatrix_isSelfAdjoint x⟩
+
+/-- A self-adjoint matrix formed from a space-time point. -/
+@[simp]
+noncomputable def fromSelfAdjointMatrix' (x : selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ)) :
+    LorentzVector 3 := fun i =>
+  match i with
+  | Sum.inl 0 => 1/2 * (x.1 0 0 + x.1 1 1).re
+  | Sum.inr 0 => (x.1 1 0).re
+  | Sum.inr 1 => (x.1 1 0).im
+  | Sum.inr 2 => 1/2 * (x.1 0 0 - x.1 1 1).re
+
+
+/-- The linear equivalence between the vector-space `spaceTime` and self-adjoint
+  2×2-complex matrices. -/
+noncomputable def toSelfAdjointMatrix :
+    LorentzVector 3 ≃ₗ[ℝ] selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ) where
+  toFun := toSelfAdjointMatrix'
+  invFun := fromSelfAdjointMatrix'
+  left_inv x := by
+    funext i
+    match i with
+    | Sum.inl 0 =>
+      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+      ring_nf
+    | Sum.inr 0 =>
+      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+    | Sum.inr 1 =>
+      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+    | Sum.inr 2 =>
+      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+      ring
+  right_inv x := by
+    simp only [toSelfAdjointMatrix', toMatrix, LorentzVector.time, fromSelfAdjointMatrix', one_div,
+      Fin.isValue, add_re, ofReal_mul, ofReal_inv, ofReal_ofNat, ofReal_add, LorentzVector.space,
+      Function.comp_apply, sub_re, ofReal_sub, re_add_im]
+    ext i j
+    fin_cases i <;> fin_cases j <;>
+      field_simp [fromSelfAdjointMatrix', toMatrix, conj_ofReal]
+    exact conj_eq_iff_re.mp (congrArg (fun M => M 0 0) $ selfAdjoint.mem_iff.mp x.2 )
+    have h01 := congrArg (fun M => M 0 1) $ selfAdjoint.mem_iff.mp x.2
+    simp only [Fin.isValue, star_apply, RCLike.star_def] at h01
+    rw [← h01, RCLike.conj_eq_re_sub_im]
+    rfl
+    exact conj_eq_iff_re.mp (congrArg (fun M => M 1 1) $ selfAdjoint.mem_iff.mp x.2 )
+  map_add' x y  := by
+    ext i j : 2
+    simp only [toSelfAdjointMatrix'_coe, add_apply, ofReal_add, of_apply, cons_val', empty_val',
+      cons_val_fin_one, AddSubmonoid.coe_add, AddSubgroup.coe_toAddSubmonoid, Matrix.add_apply]
+    fin_cases i <;> fin_cases j
+    · rw [show (x + y) (Sum.inl 0) = x (Sum.inl 0) + y (Sum.inl 0) from rfl]
+      rw [show (x + y) (Sum.inr 2) = x (Sum.inr 2) + y (Sum.inr 2) from rfl]
+      simp only [Fin.isValue, ofReal_add, Fin.zero_eta, cons_val_zero]
+      ring
+    · rw [show (x + y) (Sum.inr 0) = x (Sum.inr 0) + y (Sum.inr 0) from rfl]
+      rw [show (x + y) (Sum.inr 1) = x (Sum.inr 1) + y (Sum.inr 1) from rfl]
+      simp only [Fin.isValue, ofReal_add, Fin.mk_one, cons_val_one, head_cons, Fin.zero_eta,
+        cons_val_zero]
+      ring
+    · rw [show (x + y) (Sum.inr 0) = x (Sum.inr 0) + y (Sum.inr 0) from rfl]
+      rw [show (x + y) (Sum.inr 1) = x (Sum.inr 1) + y (Sum.inr 1) from rfl]
+      simp only [Fin.isValue, ofReal_add, Fin.zero_eta, cons_val_zero, Fin.mk_one, cons_val_one,
+        head_fin_const]
+      ring
+    · rw [show (x + y) (Sum.inl 0) = x (Sum.inl 0) + y (Sum.inl 0) from rfl]
+      rw [show (x + y) (Sum.inr 2) = x (Sum.inr 2) + y (Sum.inr 2) from rfl]
+      simp only [Fin.isValue, ofReal_add, Fin.mk_one, cons_val_one, head_cons, head_fin_const]
+      ring
+  map_smul' r x := by
+    ext i j : 2
+    simp only [toSelfAdjointMatrix'_coe, Fin.isValue, of_apply, cons_val', empty_val',
+      cons_val_fin_one, RingHom.id_apply, selfAdjoint.val_smul, smul_apply, real_smul]
+    fin_cases i <;> fin_cases j
+    · rw [show (r • x) (Sum.inl 0) = r * x (Sum.inl 0)  from rfl]
+      rw [show (r • x) (Sum.inr 2) = r * x (Sum.inr 2)  from rfl]
+      simp only [Fin.isValue, ofReal_mul, Fin.zero_eta, cons_val_zero]
+      ring
+    · rw [show (r • x) (Sum.inr 0) = r * x (Sum.inr 0)  from rfl]
+      rw [show (r • x) (Sum.inr 1) = r * x (Sum.inr 1)  from rfl]
+      simp only [Fin.isValue, ofReal_mul, Fin.mk_one, cons_val_one, head_cons, Fin.zero_eta,
+        cons_val_zero]
+      ring
+    · rw [show (r • x) (Sum.inr 0) = r * x (Sum.inr 0)  from rfl]
+      rw [show (r • x) (Sum.inr 1) = r * x (Sum.inr 1)  from rfl]
+      simp only [Fin.isValue, ofReal_mul, Fin.zero_eta, cons_val_zero, Fin.mk_one, cons_val_one,
+        head_fin_const]
+      ring
+    · rw [show (r • x) (Sum.inl 0) = r * x (Sum.inl 0)  from rfl]
+      rw [show (r • x) (Sum.inr 2) = r * x (Sum.inr 2)  from rfl]
+      simp only [Fin.isValue, ofReal_mul, Fin.mk_one, cons_val_one, head_cons, head_fin_const]
+      ring
+
+open minkowskiMetric in
+lemma det_eq_ηLin (x : LorentzVector 3) : det (toSelfAdjointMatrix x).1 = ⟪x, x⟫ₘ := by
+  simp only [toSelfAdjointMatrix, LinearEquiv.coe_mk, toSelfAdjointMatrix'_coe, Fin.isValue,
+    det_fin_two_of, eq_time_minus_inner_prod, LorentzVector.time, LorentzVector.space,
+    PiLp.inner_apply, Function.comp_apply, RCLike.inner_apply, conj_trivial, Fin.sum_univ_three,
+    ofReal_sub, ofReal_mul, ofReal_add]
+  ring_nf
+  simp only [Fin.isValue, I_sq, mul_neg, mul_one]
+  ring
+
+end SpaceTime
diff --git a/HepLean/SpaceTime/LorentzVector/Basic.lean b/HepLean/SpaceTime/LorentzVector/Basic.lean
index 9b58852..72d9a06 100644
--- a/HepLean/SpaceTime/LorentzVector/Basic.lean
+++ b/HepLean/SpaceTime/LorentzVector/Basic.lean
@@ -33,6 +33,11 @@ noncomputable instance : Module ℝ (LorentzVector d) := Pi.module _ _ _
 
 instance : AddCommGroup (LorentzVector d) := Pi.addCommGroup
 
+/-- The structure of a topological space `LorentzVector d`. -/
+instance : TopologicalSpace (LorentzVector d) :=
+  haveI : NormedAddCommGroup (LorentzVector d) := Pi.normedAddCommGroup
+  UniformSpace.toTopologicalSpace
+
 namespace LorentzVector
 
 variable {d : ℕ}
@@ -53,26 +58,29 @@ def time : ℝ := v (Sum.inl 0)
 
 -/
 
-/-- The standard basis of `LorentzVector`. -/
+/-- The standard basis of `LorentzVector` indexed by `Fin 1 ⊕ Fin (d)`. -/
 @[simps!]
 noncomputable def stdBasis : Basis (Fin 1 ⊕ Fin (d)) ℝ (LorentzVector d) := Pi.basisFun ℝ _
 
+scoped[LorentzVector] notation "e" => stdBasis
+
+lemma stdBasis_apply (μ ν : Fin 1 ⊕ Fin d) : e μ ν = if μ = ν then 1 else 0 := by
+  rw [stdBasis]
+  erw [Pi.basisFun_apply]
+  simp
+
 /-- The standard unit time vector. -/
-@[simp]
-noncomputable def timeVec : (LorentzVector d) := stdBasis (Sum.inl 0)
+noncomputable abbrev timeVec : (LorentzVector d) := e (Sum.inl 0)
 
 @[simp]
 lemma timeVec_space : (@timeVec d).space = 0 := by
   funext i
-  simp [space, stdBasis]
-  erw [Pi.basisFun_apply]
-  simp_all only [Fin.isValue, LinearMap.stdBasis_apply', ↓reduceIte]
+  simp only [space, Function.comp_apply, stdBasis_apply, Fin.isValue, ↓reduceIte, PiLp.zero_apply]
 
 @[simp]
 lemma timeVec_time: (@timeVec d).time = 1 := by
-  simp [space, stdBasis]
-  erw [Pi.basisFun_apply]
-  simp_all only [Fin.isValue, LinearMap.stdBasis_apply', ↓reduceIte]
+  simp only [time, Fin.isValue, stdBasis_apply, ↓reduceIte]
+
 
 /-!
 
diff --git a/HepLean/SpaceTime/LorentzVector/NormOne.lean b/HepLean/SpaceTime/LorentzVector/NormOne.lean
index 588db82..3e96884 100644
--- a/HepLean/SpaceTime/LorentzVector/NormOne.lean
+++ b/HepLean/SpaceTime/LorentzVector/NormOne.lean
@@ -17,10 +17,13 @@ open minkowskiMetric
 def NormOneLorentzVector (d : ℕ) : Set (LorentzVector d) :=
   fun x => ⟪x, x⟫ₘ = 1
 
+instance : TopologicalSpace (NormOneLorentzVector d) := instTopologicalSpaceSubtype
+
 namespace NormOneLorentzVector
 
 variable {d : ℕ}
 
+section
 variable (v w : NormOneLorentzVector d)
 
 lemma mem_iff {x : LorentzVector d} : x ∈ NormOneLorentzVector d ↔ ⟪x, x⟫ₘ = 1 := by
@@ -91,8 +94,11 @@ lemma time_abs_sub_space_norm  :
 def FuturePointing (d : ℕ) : Set (NormOneLorentzVector d) :=
   fun x => 0 < x.1.time
 
+instance : TopologicalSpace (FuturePointing d) := instTopologicalSpaceSubtype
+
 namespace FuturePointing
 
+section
 variable (f f' : FuturePointing d)
 
 lemma mem_iff : v ∈ FuturePointing d ↔ 0 < v.1.time := by
@@ -124,9 +130,30 @@ lemma time_nonneg : 0 ≤ f.1.1.time := le_of_lt f.2
 
 lemma abs_time : |f.1.1.time| = f.1.1.time := abs_of_nonneg (time_nonneg f)
 
+lemma time_eq_sqrt : f.1.1.time = √(1 + ‖f.1.1.space‖ ^ 2) := by
+  symm
+  rw [Real.sqrt_eq_cases]
+  apply Or.inl
+  rw [← time_sq, sq]
+  exact ⟨rfl, time_nonneg f⟩
+
 /-!
 
-# The value sign of ⟪v, w.1.spaceReflection⟫ₘ different v and w
+# The sign of ⟪v, w.1⟫ₘ different v and w
+
+-/
+
+lemma metric_nonneg : 0 ≤ ⟪f, f'.1.1⟫ₘ := by
+  apply le_trans (time_abs_sub_space_norm f f'.1)
+  rw [abs_time f, abs_time f']
+  exact ge_sub_norm f.1.1 f'.1.1
+
+lemma one_add_metric_non_zero : 1 + ⟪f, f'.1.1⟫ₘ ≠ 0 := by
+  linarith [metric_nonneg f f']
+
+/-!
+
+# The sign of ⟪v, w.1.spaceReflection⟫ₘ different v and w
 
 -/
 
@@ -165,6 +192,108 @@ lemma metric_reflect_not_mem_mem (h : v ∉ FuturePointing d) (hw :  w ∈ Futur
   simp [neg]
 
 end
+end
+
+end FuturePointing
+end
+
+namespace FuturePointing
+/-!
+
+# Topology
+
+-/
+open LorentzVector
+
+/-- The `FuturePointing d` which has all space components zero. -/
+@[simps!]
+noncomputable def timeVecNormOneFuture : FuturePointing d := ⟨⟨timeVec, by
+  rw [NormOneLorentzVector.mem_iff, on_timeVec]⟩, by
+  rw [mem_iff, timeVec_time]; simp⟩
+
+
+/-- A continuous path from `timeVecNormOneFuture` to any other. -/
+noncomputable def pathFromTime (u : FuturePointing d) : Path timeVecNormOneFuture u where
+  toFun t := ⟨
+    ⟨fun i => match i with
+      | Sum.inl 0 => √(1 + t ^ 2 * ‖u.1.1.space‖ ^ 2)
+      | Sum.inr i => t * u.1.1.space i,
+    by
+      rw [NormOneLorentzVector.mem_iff, minkowskiMetric.eq_time_minus_inner_prod]
+      simp only [time, space, Function.comp_apply, PiLp.inner_apply, RCLike.inner_apply, map_mul,
+        conj_trivial]
+      rw [Real.mul_self_sqrt, ← @real_inner_self_eq_norm_sq, @PiLp.inner_apply]
+      simp only [Function.comp_apply, RCLike.inner_apply, conj_trivial]
+      have h1 : ∑ x : Fin d, t.1 * u.1.1 (Sum.inr x) * (↑t.1 * u.1.1 (Sum.inr x)) =
+        t ^ 2 * ∑ x : Fin d, u.1.1 (Sum.inr x) * u.1.1 (Sum.inr x) := by
+        rw [Finset.mul_sum]
+        apply Finset.sum_congr rfl
+        intro i _
+        ring
+      rw [h1]
+      ring
+      refine Right.add_nonneg (zero_le_one' ℝ) $ mul_nonneg (sq_nonneg _) (sq_nonneg _) ⟩,
+    by
+      simp only [space, Function.comp_apply, mem_iff_time_nonneg, time, Real.sqrt_pos]
+      exact Real.sqrt_nonneg _⟩
+  continuous_toFun := by
+    refine Continuous.subtype_mk ?_ _
+    refine Continuous.subtype_mk ?_ _
+    apply (continuous_pi_iff).mpr
+    intro i
+    match i with
+    | Sum.inl 0 =>
+      continuity
+    | Sum.inr i =>
+      continuity
+  source' := by
+    ext
+    funext i
+    match i with
+    | Sum.inl 0 =>
+      simp only [Set.Icc.coe_zero, ne_eq, OfNat.ofNat_ne_zero, not_false_eq_true, zero_pow, space,
+        zero_mul, add_zero, Real.sqrt_one, Fin.isValue, timeVecNormOneFuture_coe_coe]
+      exact Eq.symm timeVec_time
+    | Sum.inr i =>
+      simp only [Set.Icc.coe_zero, space, Function.comp_apply, zero_mul,
+        timeVecNormOneFuture_coe_coe]
+      change _ = timeVec.space i
+      rw [timeVec_space]
+      rfl
+  target' := by
+    ext
+    funext i
+    match i with
+    | Sum.inl 0 =>
+      simp only [Set.Icc.coe_one, one_pow, space, one_mul, Fin.isValue]
+      exact (time_eq_sqrt u).symm
+    | Sum.inr i =>
+      simp only [Set.Icc.coe_one, one_pow, space, one_mul, Fin.isValue]
+      exact rfl
+
+
+
+
+lemma isPathConnected : IsPathConnected (@Set.univ (FuturePointing d)) := by
+  use timeVecNormOneFuture
+  apply And.intro trivial  ?_
+  intro y a
+  use pathFromTime y
+  exact fun _ => a
+
+
+lemma metric_continuous (u : LorentzVector d) :
+    Continuous (fun (a : FuturePointing d) => ⟪u, a.1.1⟫ₘ) := by
+  simp only [minkowskiMetric.eq_time_minus_inner_prod]
+  refine Continuous.add ?_ ?_
+  · refine Continuous.comp' (continuous_mul_left _) $ Continuous.comp'
+      (continuous_apply (Sum.inl 0))
+      (Continuous.comp' continuous_subtype_val continuous_subtype_val)
+  · refine Continuous.comp' continuous_neg $ Continuous.inner
+     (Continuous.comp' (Pi.continuous_precomp Sum.inr) continuous_const)
+     (Continuous.comp' (Pi.continuous_precomp Sum.inr) (Continuous.comp'
+      continuous_subtype_val continuous_subtype_val))
+
 
 end FuturePointing
 
diff --git a/HepLean/SpaceTime/Metric.lean b/HepLean/SpaceTime/Metric.lean
deleted file mode 100644
index 3c54274..0000000
--- a/HepLean/SpaceTime/Metric.lean
+++ /dev/null
@@ -1,273 +0,0 @@
-/-
-Copyright (c) 2024 Joseph Tooby-Smith. All rights reserved.
-Released under Apache 2.0 license.
-Authors: Joseph Tooby-Smith
--/
-import HepLean.SpaceTime.Basic
-import Mathlib.Algebra.Lie.Classical
-import Mathlib.LinearAlgebra.QuadraticForm.Basic
-/-!
-# Spacetime Metric
-
-This file introduces the metric on spacetime in the (+, -, -, -) signature.
-
-## TODO
-
-This file needs refactoring.
-- The metric should be defined as a bilinear map on `LorentzVector d`.
-- From this definition, we should derive the metric as a matrix.
-
--/
-
-noncomputable section
-
-namespace SpaceTime
-
-open Manifold
-open Matrix
-open Complex
-open ComplexConjugate
-open TensorProduct
-
-/-- The metric as a `4×4` real matrix. -/
-def η : Matrix (Fin 4) (Fin 4) ℝ := Matrix.reindex finSumFinEquiv finSumFinEquiv
-  $ LieAlgebra.Orthogonal.indefiniteDiagonal (Fin 1) (Fin 3) ℝ
-
-/-- The metric with lower indices. -/
-notation "η_[" μ "]_[" ν "]" => η μ ν
-
-/-- The inverse of `η`. Used for notation. -/
-def ηInv : Matrix (Fin 4) (Fin 4) ℝ := η
-
-/-- The metric with upper indices. -/
-notation "η^[" μ "]^[" ν "]" => ηInv μ ν
-
-/-- A matrix with one lower and one upper index. -/
-notation "["Λ"]^[" μ "]_[" ν "]" => (Λ : Matrix (Fin 4) (Fin 4) ℝ) μ ν
-
-/-- A matrix with both lower indices. -/
-notation "["Λ"]_[" μ "]_[" ν "]" => ∑ ρ, η_[μ]_[ρ] * [Λ]^[ρ]_[ν]
-
-/--  `η` with $η^μ_ν$ indices. This is equivalent to the identity. This is used for notation. -/
-def ηUpDown : Matrix (Fin 4) (Fin 4) ℝ := 1
-
-/-- The metric with one lower and one upper index. -/
-notation "η^[" μ "]_[" ν "]" => ηUpDown μ ν
-
-
-lemma η_block : η = Matrix.reindex finSumFinEquiv finSumFinEquiv (
-    Matrix.fromBlocks (1 : Matrix (Fin 1) (Fin 1) ℝ) 0 0 (-1 : Matrix (Fin 3) (Fin 3) ℝ)) := by
-  rw [η]
-  congr
-  simp [LieAlgebra.Orthogonal.indefiniteDiagonal]
-  rw [← fromBlocks_diagonal]
-  refine fromBlocks_inj.mpr ?_
-  simp only [diagonal_one, true_and]
-  funext i j
-  rw [← diagonal_neg]
-  rfl
-
-lemma η_reindex : (Matrix.reindex finSumFinEquiv finSumFinEquiv).symm η =
-    LieAlgebra.Orthogonal.indefiniteDiagonal (Fin 1) (Fin 3) ℝ :=
-  (Equiv.symm_apply_eq (reindex finSumFinEquiv finSumFinEquiv)).mpr rfl
-
-lemma η_explicit : η = !![(1 : ℝ), 0, 0, 0; 0, -1, 0, 0; 0, 0, -1, 0; 0, 0, 0, -1] := by
-  rw [η_block]
-  apply Matrix.ext
-  intro i j
-  fin_cases i <;> fin_cases j
-    <;> simp_all only [Fin.zero_eta, reindex_apply, submatrix_apply]
-  any_goals rfl
-  all_goals simp [finSumFinEquiv, Fin.addCases, η, vecHead, vecTail]
-  any_goals rfl
-  all_goals split
-  all_goals simp
-  all_goals rfl
-
-@[simp]
-lemma η_off_diagonal {μ ν : Fin 4} (h : μ ≠ ν) : η μ ν = 0 := by
-  fin_cases μ <;>
-    fin_cases ν <;>
-      simp_all [η_explicit, Fin.mk_one, Fin.mk_one, vecHead, vecTail]
-
-lemma η_symmetric (μ ν : Fin 4) : η μ ν = η ν μ := by
-  by_cases h : μ = ν
-  rw [h]
-  rw [η_off_diagonal h]
-  exact Eq.symm (η_off_diagonal fun a => h (id (Eq.symm a)))
-
-@[simp]
-lemma η_transpose : η.transpose = η := by
-  funext μ ν
-  rw [transpose_apply, η_symmetric]
-
-@[simp]
-lemma det_η : η.det = - 1 := by
-  simp [η_explicit, det_succ_row_zero, Fin.sum_univ_succ]
-
-@[simp]
-lemma η_sq : η * η = 1 := by
-  funext μ ν
-  fin_cases μ <;> fin_cases ν <;>
-     simp [η_explicit, vecHead, vecTail]
-
-lemma η_diag_mul_self (μ : Fin 4) : η μ μ * η μ μ  = 1 := by
-  fin_cases μ <;> simp [η_explicit]
-
-lemma η_mulVec (x : SpaceTime) : η *ᵥ x = ![x 0, -x 1, -x 2, -x 3] := by
-  rw [explicit x, η_explicit]
-  funext i
-  fin_cases i <;>
-  simp [vecHead, vecTail]
-
-lemma η_as_diagonal : η = diagonal ![1, -1, -1, -1] := by
-  rw [η_explicit]
-  apply Matrix.ext
-  intro μ ν
-  fin_cases μ <;> fin_cases ν <;> rfl
-
-lemma η_mul (Λ : Matrix (Fin 4) (Fin 4) ℝ) (μ ρ : Fin 4) :
-    [η * Λ]^[μ]_[ρ] = [η]^[μ]_[μ] * [Λ]^[μ]_[ρ] := by
-  rw  [η_as_diagonal, @diagonal_mul, diagonal_apply_eq ![1, -1, -1, -1] μ]
-
-lemma mul_η (Λ : Matrix (Fin 4) (Fin 4) ℝ) (μ ρ : Fin 4) :
-    [Λ * η]^[μ]_[ρ] =  [Λ]^[μ]_[ρ] * [η]^[ρ]_[ρ] := by
-  rw [η_as_diagonal, @mul_diagonal, diagonal_apply_eq ![1, -1, -1, -1] ρ]
-
-lemma η_mul_self (μ ν : Fin 4) : η^[ν]_[μ] * η_[ν]_[ν] = η_[μ]_[ν] := by
-  fin_cases μ <;> fin_cases ν <;> simp [ηUpDown]
-
-lemma η_contract_self (μ ν : Fin 4) : ∑ x, (η^[x]_[μ] * η_[x]_[ν]) = η_[μ]_[ν] := by
-  rw [Fin.sum_univ_four]
-  fin_cases μ <;> fin_cases ν <;> simp [ηUpDown]
-
-lemma η_contract_self' (μ ν : Fin 4) : ∑ x, (η^[x]_[μ] * η_[ν]_[x]) = η_[ν]_[μ] := by
-  rw [Fin.sum_univ_four]
-  fin_cases μ <;> fin_cases ν <;> simp [ηUpDown]
-
-
-
-/-- Given a point in spaceTime `x` the linear map `y → x ⬝ᵥ (η *ᵥ y)`. -/
-@[simps!]
-def linearMapForSpaceTime (x : SpaceTime) : SpaceTime →ₗ[ℝ] ℝ where
-  toFun y := x ⬝ᵥ (η *ᵥ y)
-  map_add' y z := by
-    simp only
-    rw [mulVec_add, dotProduct_add]
-  map_smul' c y := by
-    simp only [RingHom.id_apply, smul_eq_mul]
-    rw [mulVec_smul, dotProduct_smul]
-    rfl
-
-/-- The metric as a bilinear map from `spaceTime` to `ℝ`. -/
-def ηLin : LinearMap.BilinForm ℝ SpaceTime where
-  toFun x := linearMapForSpaceTime x
-  map_add' x y := by
-    apply LinearMap.ext
-    intro z
-    simp only [linearMapForSpaceTime_apply, LinearMap.add_apply]
-    rw [add_dotProduct]
-  map_smul' c x := by
-    apply LinearMap.ext
-    intro z
-    simp only [linearMapForSpaceTime_apply, RingHom.id_apply, LinearMap.smul_apply, smul_eq_mul]
-    rw [smul_dotProduct]
-    rfl
-
-lemma ηLin_expand (x y : SpaceTime) : ηLin x y = x 0 * y 0 - x 1 * y 1 - x 2 * y 2 - x 3 * y 3 := by
-  rw [ηLin]
-  simp only [LinearMap.coe_mk, AddHom.coe_mk, linearMapForSpaceTime_apply, Fin.isValue]
-  erw [η_mulVec]
-  nth_rewrite 1 [explicit x]
-  simp only [dotProduct, Nat.succ_eq_add_one, Nat.reduceAdd, Fin.isValue, Fin.sum_univ_four,
-    cons_val_zero, cons_val_one, head_cons, mul_neg, cons_val_two, tail_cons, cons_val_three]
-  ring
-
-lemma ηLin_expand_self (x : SpaceTime) : ηLin x x = x 0 ^ 2 - ‖x.space‖ ^ 2 := by
-  rw [← @real_inner_self_eq_norm_sq, @PiLp.inner_apply, Fin.sum_univ_three, ηLin_expand]
-  noncomm_ring
-
-lemma time_elm_sq_of_ηLin (x : SpaceTime) : x 0 ^ 2 = ηLin x x + ‖x.space‖ ^ 2 := by
-  rw [ηLin_expand_self]
-  ring
-
-lemma ηLin_leq_time_sq (x : SpaceTime) : ηLin x x ≤ x 0 ^ 2 := by
-  rw [time_elm_sq_of_ηLin]
-  exact (le_add_iff_nonneg_right _).mpr $ sq_nonneg ‖x.space‖
-
-lemma ηLin_space_inner_product (x y : SpaceTime) :
-    ηLin x y = x 0 * y 0 - ⟪x.space, y.space⟫_ℝ  := by
-  rw [ηLin_expand, @PiLp.inner_apply, Fin.sum_univ_three]
-  noncomm_ring
-
-lemma ηLin_ge_abs_inner_product (x y : SpaceTime) :
-    x 0 * y 0 - ‖⟪x.space, y.space⟫_ℝ‖ ≤ (ηLin x y)  := by
-  rw [ηLin_space_inner_product, sub_le_sub_iff_left]
-  exact Real.le_norm_self ⟪x.space, y.space⟫_ℝ
-
-lemma ηLin_ge_sub_norm (x y : SpaceTime) :
-    x 0 * y 0 - ‖x.space‖ * ‖y.space‖ ≤ (ηLin x y)  := by
-  apply le_trans ?_ (ηLin_ge_abs_inner_product x y)
-  rw [sub_le_sub_iff_left]
-  exact norm_inner_le_norm x.space y.space
-
-
-lemma ηLin_symm (x y : SpaceTime) : ηLin x y = ηLin y x := by
-  rw [ηLin_expand, ηLin_expand]
-  ring
-
-lemma ηLin_stdBasis_apply (μ : Fin 4) (x : SpaceTime) : ηLin (stdBasis μ) x = η μ μ * x μ := by
-  rw [ηLin_expand]
-  fin_cases μ
-   <;> simp [stdBasis_0, stdBasis_1, stdBasis_2, stdBasis_3, η_explicit]
-
-
-lemma ηLin_η_stdBasis (μ ν : Fin 4) : ηLin (stdBasis μ) (stdBasis ν) = η μ ν := by
-  rw [ηLin_stdBasis_apply]
-  by_cases h : μ = ν
-  · rw [stdBasis_apply]
-    subst h
-    simp
-  · rw [stdBasis_not_eq, η_off_diagonal h]
-    exact CommMonoidWithZero.mul_zero η_[μ]_[μ]
-    exact fun a ↦ h (id a.symm)
-
-set_option maxHeartbeats 0
-lemma ηLin_mulVec_left (x y : SpaceTime) (Λ : Matrix (Fin 4) (Fin 4) ℝ) :
-    ηLin (Λ *ᵥ x) y = ηLin x ((η * Λᵀ * η) *ᵥ y) := by
-  simp [ηLin, LinearMap.coe_mk, AddHom.coe_mk, linearMapForSpaceTime_apply,
-    mulVec_mulVec, (vecMul_transpose Λ x).symm, ← dotProduct_mulVec, mulVec_mulVec,
-    ← mul_assoc, ← mul_assoc, η_sq, one_mul]
-
-lemma ηLin_mulVec_right (x y : SpaceTime) (Λ : Matrix (Fin 4) (Fin 4) ℝ) :
-    ηLin x (Λ *ᵥ y) = ηLin ((η * Λᵀ * η) *ᵥ x) y := by
-  rw [ηLin_symm, ηLin_symm ((η * Λᵀ * η) *ᵥ x) _ ]
-  exact ηLin_mulVec_left y x Λ
-
-lemma ηLin_matrix_stdBasis (μ ν : Fin 4) (Λ : Matrix (Fin 4) (Fin 4) ℝ) :
-    ηLin (stdBasis ν) (Λ *ᵥ stdBasis μ)  = η ν ν * Λ ν μ := by
-  rw [ηLin_stdBasis_apply, stdBasis_mulVec]
-
-lemma ηLin_matrix_stdBasis' (μ ν : Fin 4) (Λ : Matrix (Fin 4) (Fin 4) ℝ) :
-    Λ ν μ  = η ν ν *  ηLin (stdBasis ν) (Λ *ᵥ stdBasis μ)  := by
-  rw [ηLin_matrix_stdBasis, ← mul_assoc, η_diag_mul_self, one_mul]
-
-lemma ηLin_matrix_eq_identity_iff (Λ : Matrix (Fin 4) (Fin 4) ℝ) :
-    Λ = 1 ↔ ∀ (x y : SpaceTime), ηLin x y = ηLin x (Λ *ᵥ y) := by
-  apply Iff.intro
-  · intro h
-    subst h
-    simp only [ηLin, one_mulVec, implies_true]
-  · intro h
-    funext μ ν
-    have h1 := h (stdBasis μ) (stdBasis ν)
-    rw [ηLin_matrix_stdBasis, ηLin_η_stdBasis] at h1
-    fin_cases μ <;> fin_cases ν <;>
-    simp_all [η_explicit,  Fin.mk_one, Fin.mk_one, vecHead, vecTail]
-
-/-- The metric as a quadratic form on `spaceTime`. -/
-def quadraticForm : QuadraticForm ℝ SpaceTime := ηLin.toQuadraticForm
-
-end SpaceTime
-
-end
diff --git a/HepLean/SpaceTime/MinkowskiMetric.lean b/HepLean/SpaceTime/MinkowskiMetric.lean
index bfc842d..27ad271 100644
--- a/HepLean/SpaceTime/MinkowskiMetric.lean
+++ b/HepLean/SpaceTime/MinkowskiMetric.lean
@@ -60,6 +60,17 @@ lemma eq_transpose : minkowskiMatrixᵀ = @minkowskiMatrix d := by
 lemma det_eq_neg_one_pow_d : (@minkowskiMatrix d).det = (- 1) ^ d := by
   simp [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal]
 
+lemma as_block :  @minkowskiMatrix d =  (
+    Matrix.fromBlocks (1 : Matrix (Fin 1) (Fin 1) ℝ) 0 0 (-1 : Matrix (Fin d) (Fin d) ℝ)) := by
+  rw [minkowskiMatrix]
+  congr
+  simp [LieAlgebra.Orthogonal.indefiniteDiagonal]
+  rw [← fromBlocks_diagonal]
+  refine fromBlocks_inj.mpr ?_
+  simp only [diagonal_one, true_and]
+  funext i j
+  rw [← diagonal_neg]
+  rfl
 
 
 end minkowskiMatrix
@@ -204,15 +215,6 @@ lemma ge_sub_norm : v.time * w.time - ‖v.space‖ * ‖w.space‖ ≤ ⟪v, w
   rw [sub_le_sub_iff_left]
   exact norm_inner_le_norm v.space w.space
 
-/-!
-
-# The Minkowski metric and the standard basis
-
--/
-
-lemma on_timeVec : ⟪timeVec, @timeVec d⟫ₘ = 1 := by
-  rw [self_eq_time_minus_norm, timeVec_time, timeVec_space]
-  simp [LorentzVector.stdBasis, minkowskiMetric]
 
 /-!
 
@@ -302,6 +304,51 @@ lemma matrix_eq_id_iff : Λ = 1 ↔ ∀ w v, ⟪v, Λ *ᵥ w⟫ₘ = ⟪v, w⟫
   simp
 
 
-end matrices
+/-!
 
+# The Minkowski metric and the standard basis
+
+-/
+
+@[simp]
+lemma basis_left (μ : Fin 1 ⊕ Fin d)  : ⟪e μ, v⟫ₘ  = η μ μ * v μ := by
+  rw [as_sum]
+  rcases μ with μ | μ
+  · fin_cases μ
+    simp [stdBasis_apply, minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal]
+  · simp [stdBasis_apply, minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal]
+
+@[simp]
+lemma on_timeVec : ⟪timeVec, @timeVec d⟫ₘ = 1 := by
+  simp only [timeVec, Fin.isValue, basis_left, minkowskiMatrix,
+    LieAlgebra.Orthogonal.indefiniteDiagonal, diagonal_apply_eq, Sum.elim_inl, stdBasis_apply,
+    ↓reduceIte, mul_one]
+
+@[simp]
+lemma on_basis_mulVec (μ ν : Fin 1 ⊕ Fin d) : ⟪e μ, Λ *ᵥ e ν⟫ₘ = η μ μ * Λ μ ν  := by
+  simp [basis_left, mulVec, dotProduct, stdBasis_apply]
+
+@[simp]
+lemma on_basis (μ ν : Fin 1 ⊕ Fin d) : ⟪e μ, e ν⟫ₘ = η μ ν := by
+  rw [basis_left, stdBasis_apply]
+  by_cases h : μ = ν
+  · simp [h]
+  · simp [h, LieAlgebra.Orthogonal.indefiniteDiagonal, minkowskiMatrix]
+    exact fun a => False.elim (h (id (Eq.symm a)))
+
+lemma matrix_apply_stdBasis (ν μ :  Fin 1 ⊕ Fin d):
+    Λ ν μ  = η ν ν *  ⟪e ν, Λ *ᵥ e μ⟫ₘ  := by
+  rw [on_basis_mulVec, ← mul_assoc]
+  have h1 : η ν ν * η ν ν = 1 := by
+    simp [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal]
+    rcases μ
+    · rcases ν
+      · simp_all only [Sum.elim_inl, mul_one]
+      · simp_all only [Sum.elim_inr, mul_neg, mul_one, neg_neg]
+    · rcases ν
+      · simp_all only [Sum.elim_inl, mul_one]
+      · simp_all only [Sum.elim_inr, mul_neg, mul_one, neg_neg]
+  simp [h1]
+
+end matrices
 end minkowskiMetric
diff --git a/HepLean/SpaceTime/SL2C/Basic.lean b/HepLean/SpaceTime/SL2C/Basic.lean
index 9de6358..34e6ee2 100644
--- a/HepLean/SpaceTime/SL2C/Basic.lean
+++ b/HepLean/SpaceTime/SL2C/Basic.lean
@@ -64,7 +64,7 @@ def repSelfAdjointMatrix : Representation ℝ SL(2, ℂ) $ selfAdjoint (Matrix (
 
 /-- The representation of  `SL(2, ℂ)` on `spaceTime` obtained from `toSelfAdjointMatrix` and
   `repSelfAdjointMatrix`. -/
-def repSpaceTime : Representation ℝ SL(2, ℂ) SpaceTime where
+def repLorentzVector : Representation ℝ SL(2, ℂ) (LorentzVector 3) where
   toFun M := toSelfAdjointMatrix.symm.comp ((repSelfAdjointMatrix M).comp
     toSelfAdjointMatrix.toLinearMap)
   map_one' := by
@@ -84,15 +84,28 @@ In the next section we will restrict this homomorphism to the restricted Lorentz
 
 -/
 
+lemma iff_det_selfAdjoint (Λ : Matrix (Fin 1 ⊕ Fin 3) (Fin 1 ⊕ Fin 3) ℝ):  Λ ∈ LorentzGroup 3 ↔
+    ∀ (x : selfAdjoint (Matrix (Fin 2) (Fin 2) ℂ)),
+    det ((toSelfAdjointMatrix ∘ toLin LorentzVector.stdBasis LorentzVector.stdBasis Λ ∘ toSelfAdjointMatrix.symm) x).1
+    = det x.1 := by
+  rw [LorentzGroup.mem_iff_norm]
+  apply Iff.intro
+  intro h x
+  have h1 := congrArg ofReal $ h (toSelfAdjointMatrix.symm x)
+  simpa [← det_eq_ηLin] using h1
+  intro h x
+  have h1 := h (toSelfAdjointMatrix x)
+  simpa [det_eq_ηLin] using h1
+
 /-- Given an element `M ∈ SL(2, ℂ)` the corresponding element of the Lorentz group. -/
 @[simps!]
-def toLorentzGroupElem (M : SL(2, ℂ)) : 𝓛 :=
-  ⟨LinearMap.toMatrix stdBasis stdBasis (repSpaceTime M) ,
-   by simp [repSpaceTime, PreservesηLin.iff_det_selfAdjoint]⟩
+def toLorentzGroupElem (M : SL(2, ℂ)) : LorentzGroup 3 :=
+  ⟨LinearMap.toMatrix LorentzVector.stdBasis LorentzVector.stdBasis (repLorentzVector M) ,
+   by simp [repLorentzVector, iff_det_selfAdjoint]⟩
 
 /-- The group homomorphism from ` SL(2, ℂ)` to the Lorentz group `𝓛`. -/
 @[simps!]
-def toLorentzGroup : SL(2, ℂ) →* 𝓛 where
+def toLorentzGroup : SL(2, ℂ) →* LorentzGroup 3  where
   toFun := toLorentzGroupElem
   map_one' := by
     simp only [toLorentzGroupElem, _root_.map_one, LinearMap.toMatrix_one]
diff --git a/scripts/lint-all.sh b/scripts/lint-all.sh
index 6c91394..3abf224 100755
--- a/scripts/lint-all.sh
+++ b/scripts/lint-all.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-python3 ./scripts/check-file-import.py
 
 echo "Running linter for Lean files"