Again, we need this to be capable of working in environments that aren't Webmaker's Popcorn Maker. If we want it in our repo then we will rewrite these parts before landing.