Added more fields to the toy example
Added more fields to the toy example
First try to support grouping all fields (not there yet)