Revert "Revert "All set besides the Switch""

This reverts commit 118ed151b3519103b32724b770e2648b4793829b.