diff --git a/airtime_mvc/application/configs/airtime-conf.php b/airtime_mvc/application/configs/airtime-conf.php
index ad939b2ce..6d2917e27 100644
--- a/airtime_mvc/application/configs/airtime-conf.php
+++ b/airtime_mvc/application/configs/airtime-conf.php
@@ -1,6 +1,6 @@
 <?php
 // This file generated by Propel 1.7.0 convert-conf target
-// from XML runtime conf file /home/sourcefabric/dev/Airtime/airtime_mvc/build/runtime-conf.xml
+// from XML runtime conf file /vagrant/airtime_mvc/build/runtime-conf.xml
 $conf = array (
   'datasources' => 
   array (
diff --git a/airtime_mvc/build/build.properties b/airtime_mvc/build/build.properties
index 556862bb1..35878010c 100644
--- a/airtime_mvc/build/build.properties
+++ b/airtime_mvc/build/build.properties
@@ -1,6 +1,6 @@
 #Note: project.home is automatically generated by the propel-install script. 
 #Any manual changes to this value will be overwritten.
-project.home = /home/sourcefabric/dev/Airtime/airtime_mvc
+project.home = /vagrant/airtime_mvc
 project.build = ${project.home}/build
 
 #Database driver
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index bef2aadf7..e2d129954 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -154,13 +154,18 @@
     <column name="image_path" phpName="DbImagePath" type="VARCHAR" size="255" required="false" defaultValue=""/>
     <!-- Fully qualified path for the image associated with this show. 
          Default is /path/to/stor/dir/:ownerId/show-images/:showId/imageName -->
+    <column name="has_autoplaylist" phpName="DbHasAutoPlaylist" type="BOOLEAN" required="true" defaultValue="false"/>
+    <column name="autoplaylist_id" phpName="DbAutoPlaylistId" type="INTEGER" required="false"/>
+    <foreign-key foreignTable="cc_playlist" name="cc_playlist_autoplaylist_fkey" onDelete="SETNULL">
+      <reference local="autoplaylist_id" foreign="id"/>
+    </foreign-key>
   </table>
   <table name="cc_show_instances" phpName="CcShowInstances">
     <column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
     <column name="description" phpName="DbDescription" type="VARCHAR" size="8192" required="false" defaultValue=""/>
     <column name="starts" phpName="DbStarts" type="TIMESTAMP" required="true"/>
     <column name="ends" phpName="DbEnds" type="TIMESTAMP" required="true"/>
-	<column name="show_id" phpName="DbShowId" type="INTEGER" required="true"/>
+    <column name="show_id" phpName="DbShowId" type="INTEGER" required="true"/>
     <column name="record" phpName="DbRecord" type="TINYINT" required="false" defaultValue="0"/>
     <column name="rebroadcast" phpName="DbRebroadcast" type="TINYINT" required="false" defaultValue="0"/>
     <column name="instance_id" phpName="DbOriginalShow" type="INTEGER" required="false"/>
@@ -173,6 +178,7 @@
      instances can be regenerated if we edit the show, which is unwanted behaviour. This column serves
      to ensure that we don't regenerate the instance. -->
     <column name="modified_instance" phpName="DbModifiedInstance" type="BOOLEAN" required="true" defaultValue="false" />
+    <column name="autoplaylist_built" phpName="DbAutoPlaylistBuilt" type="BOOLEAN" required="true" defaultValue="false"/>
 	<foreign-key foreignTable="cc_show" name="cc_show_fkey" onDelete="CASCADE">
       <reference local="show_id" foreign="id"/>
     </foreign-key>
diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index 9b1512f07..87b23b5d9 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -1,5 +1,5 @@
 -- Schema version
-INSERT INTO cc_pref("keystr", "valstr") VALUES('schema_version', '2.5.12');
+INSERT INTO cc_pref("keystr", "valstr") VALUES('schema_version', '3.0.0-alpha');
 
 INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin'));
 -- added in 2.3
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql
index a5f456b63..a7ef747ed 100644
--- a/airtime_mvc/build/sql/schema.sql
+++ b/airtime_mvc/build/sql/schema.sql
@@ -160,6 +160,8 @@ CREATE TABLE "cc_show"
     "linked" BOOLEAN DEFAULT 'f' NOT NULL,
     "is_linkable" BOOLEAN DEFAULT 't' NOT NULL,
     "image_path" VARCHAR(255) DEFAULT '',
+    "has_autoplaylist" BOOLEAN DEFAULT 'f' NOT NULL,
+    "autoplaylist_id" INTEGER,
     PRIMARY KEY ("id")
 );
 
@@ -184,6 +186,7 @@ CREATE TABLE "cc_show_instances"
     "created" TIMESTAMP NOT NULL,
     "last_scheduled" TIMESTAMP,
     "modified_instance" BOOLEAN DEFAULT 'f' NOT NULL,
+    "autoplaylist_built" BOOLEAN DEFAULT 'f' NOT NULL,
     PRIMARY KEY ("id")
 );
 
@@ -800,6 +803,11 @@ ALTER TABLE "cc_perms" ADD CONSTRAINT "cc_perms_subj_fkey"
     REFERENCES "cc_subjs" ("id")
     ON DELETE CASCADE;
 
+ALTER TABLE "cc_show" ADD CONSTRAINT "cc_playlist_autoplaylist_fkey"
+    FOREIGN KEY ("autoplaylist_id")
+    REFERENCES "cc_playlist" ("id")
+    ON DELETE SET NULL;
+
 ALTER TABLE "cc_show_instances" ADD CONSTRAINT "cc_show_fkey"
     FOREIGN KEY ("show_id")
     REFERENCES "cc_show" ("id")