Moving code around yet again.