Volume test coverage at 70%.

Still need to really test it with the range logic stuff I implemented. I'm
pretty sure a few parts fail (i.e., or statements with no overlap, and sub
statements which should generate such an or.)