breaking out fieldsets into includes, straightening SOC