Moving some code around.