Issue #20, items 1 & 2; other instructions plumbing

Needs testing on more real devices