CR - change tuples to case classes.