Large refactor - fieldsset radios WIP