Prep for merge - rename single to generic
Prep for merge - arduino sillyness