Moving code around a bit.