Dhm/acid aside

@cpennington review (incorporates the other PR and I may should move some of these into that other one)
Also, in order to work with workbench urls, you might want to use a string encoding for these, rather than a tuple.