Implement switch control to fix #335

Signed-off-by: Matt White <matthew.white@fclonline.com>