Added grouping, number fields, and the preamble.