Swap out 2 property DM types for an Enum type. Radio buttons, machine/peripheral distinction.