Dynamic upstream check

It's still actively developing. Don't merge.