Integrated switch functionality.

Slowing adding switches for custom scans.