Merge in IVS support from Rich Lane/Big Switch.

Closes #159