Redo

A lot of the right side column had to be redone because I made a mistake. It's all good now, but a bit of walking things back. At least there's a way forward.