Fixes Issue #125 - Abusing externally passed in data structure

Also had to re-jig the test, as it turns out the contributor-supplied test
for this work didn't *actually* test anything :(