Can you define this in src/control/validator.h/cpp instead and name it ControlValidator? ControlObject is redundant and something I'd like to eventually delete/rename totally.