Checkbox and radio refactor in progress