Finally finish up #86 w/ URI support