first commit, finish client, device and sensor wrapper
next TODO:  and test for this