All structs filled in, pointered and omitempty'd -- need to make fields omitempty'd too