first commit.  same as subset of manager code
renamed device