FED Cohort assignments

@talbs Would you mind reviewing this?
Yes, that's one solution. I'm not sure which I prefer. Do you have a strong preference?