So it turns out I was mostly right