Merge client and LED code bases