Kudos stuff

Kudos stuff placed in Device V2 according to where comment said to
implement