New switch assets; added some preliminary Pantheon support; downsized code.