Minor, potentially unrelated: would be nice if we didnt perform magic on this string. Instead of doing a `ucfirst` to get the finder, we could just take it as is.