Lots of changes.  REST switch interface Partially implmented.