working on consolidating the Arduino source code