Pass switch number in to local from command line plus more instrumentation.