Moving old code around a bit.