is there a nice structure we could return rather than lots of individual fields?