More progress (I think) but still not working at FNAL.