This almost works.
WIP.
This works now.
Merge branch 'master' into geointerstitial
Rollbar that works.