The commit before I fixed everything
Solid progress on control timing