Juggle code around some more