More code commits; got random branching on contextual working.