Finished transition to data struct.