Partial Match Update

All code updated to use Partial Matching for switches.