Coming back to code-in-progress after a week away. I really don’t remember what I was doing. Let’s see if I left myself any useful comments…