Refactor BasicSample

Refactored BasicSample to be "simpler".

Remaining work (possible): the (not-strictly-realistic) doValenceRequest does not handle timeskew errors. This should probably be added.