diff --git a/classes/ComicPressMediaHandling.inc b/classes/ComicPressMediaHandling.inc
new file mode 100644
index 0000000..b01b4a5
--- /dev/null
+++ b/classes/ComicPressMediaHandling.inc
@@ -0,0 +1,20 @@
+<?php
+
+class ComicPressMediaHandling {
+	function _bundle_global_variables() {
+		global $comic_folder, $archive_comic_folder, $rss_comic_folder, $mini_comic_folder;
+
+		$bundle = array();
+		foreach (array('comic', 'archive', 'rss', 'mini') as $which) {
+			switch ($which) {
+				case 'comic':
+					$bundle['comic'] = $comic_folder;
+					break;
+				default:
+					$bundle[$which] = ${"${which}_comic_folder"};
+					break;
+			}
+		}
+		return $bundle;
+	}
+}
diff --git a/test/ComicPressMediaHandlingTest.php b/test/ComicPressMediaHandlingTest.php
new file mode 100644
index 0000000..7b841ce
--- /dev/null
+++ b/test/ComicPressMediaHandlingTest.php
@@ -0,0 +1,29 @@
+<?php
+
+require_once('PHPUnit/Framework.php');
+require_once('MockPress/mockpress.php');
+require_once('vfsStream/vfsStream.php');
+require_once(dirname(__FILE__) . '/../classes/ComicPressMediaHandling.inc');
+
+class ComicPressMediaHandlingTest extends PHPUnit_Framework_TestCase {
+	function setUp() {
+		_reset_wp();
+		$this->cpmh = new ComicPressMediaHandling();
+	}
+
+	function testBundleGlobalVariables() {
+		global $comic_folder, $archive_comic_folder, $rss_comic_folder, $mini_comic_folder;
+
+		$comic_folder = 'comic';
+		$archive_comic_folder = 'archive';
+		$rss_comic_folder = 'rss';
+		$mini_comic_folder = 'mini';
+
+		$this->assertEquals(array(
+			'comic'   => 'comic',
+			'archive' => 'archive',
+			'rss'     => 'rss',
+			'mini'    => 'mini'
+		), $this->cpmh->_bundle_global_variables());
+	}
+}