Deterministic alternative choice

@erwaller could you look this over?
I updated the milestones.