Dhm/acid aside

@cpennington review (incorporates the other PR and I may should move some of these into that other one)
This will need to be fixed once the other PR is merged.