Group fields

Can now group fields together…still need to work out the kinks tho.

Signed-off-by: Oz Ramos <>