Update the main git to reflect Jimmy's changes so far
(checkpoint)