update from datasvc branch, the hard way... (bleargh!)