StateDevice -> Refactor to be more compatible with an eventual Light restriction refactor.  (doesnt  interfere with idle commands, etc)