Initial rework REST service and ZWave devices