Further moving code around.