This should be parametrizable as well. Sorry I didn't bring this up early, I missed it. Let me know if you want me to do this to merge it.