Making sure the correct branch is selected.

All this branching is making things more complicated, but this is supposed to be primarily an experiment anyway...