Start to flesh out switch/generic