Worth Trying to Take this Upstream?