#8 separate roster from core