This was just moving code around.