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

This reverts commit 6d77c57b74025484479704fd2706e6bd50da86cd.