Some shuffling around trying to get things to work.