Preparing for google API shenanigans