Made a blooper, but nearly done. Committing to avoid losing work.