This time with the proper field groups added.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>