Switch Completed

Bugs stomped.