Moved stuff around. May have broken everything.
Need to think. I think.