Here is an updated patch. I got the tests to pass. I also realized that I had to wrap some binaries. all best, jgart