moved some code around.  Sort of makes sense.