added first pass at set data collection