modifying data classes per feedback from 11/20 meeting