I've updated this for the 7.1 changes. Mostly for myself so I know what's hitting me with what but I'll give this shameless self bump to share again.