Revert "Revert "Revert "Add On-The-Go Toggle [2/2]"""

This reverts commit ccd5392f78dfb0d4467701c7f128e4d09ef944d8.