pull only switch object from model when changing switch state
remove wrapper class
minor changes