It would be nice to be able so switch into watch mode when in supervision mode.