5/18 Data Struct complete