Changes based on 4/22 meeting. Input as Dataset.