Yeah good idea, I'll try to PR something in a bit. I'm also not happy with the long eval string, I wonder how we can simplify it.