Moved things around yet again.

Spoiler warning: