DATACOUCH-16 (and DATACOUCH-36)

Hmmm,

Seems to be a roll-up of my previous two pushes.

-=david=-