Should this and the category be variables in `WAVEDCtrl`?