Leo

@mwoss on it.

@mwoss I added some unit tests and made a few other changes. Let me know what you think. note: the second test case in the `vals` map currently fails. I...