I just copied Philip's old code. I didn't want to re-write it. I will certainly be re-writing it over time, but I'd rather not have to fix these things now - since the goal was just to make the shift to a new class.