Revert "Revert "SupervisingController""

This reverts commit 3e1e3c3e9e3156a9313651bf9aafd5bc2aeac43e.