All switch statements working for short example.  Need to deal with schemas differently.