Begin to add multi-mote logic