diff --git a/website/index.php b/website/index.php
index 70d7beb1..590afcd1 100644
--- a/website/index.php
+++ b/website/index.php
@@ -1,40 +1,3 @@
-
 
 
 
@@ -114,6 +77,7 @@ $pages = Array (
 	'faq' => ' FAQ',
 	'desktop' => ' Desktop',
 	'mobile' => ' Mobile',
+	'test' => ' Test Builds',
 	'developer' => ' Developers',
 	'about' => ' About',
 	'donate' => ' Donate',
@@ -138,7 +102,7 @@ foreach ( $pages as $key => $name )
 	print "
$name\n";
 
 	# after 'mobile', add a horizontal seperator
-	if ( $key == 'mobile' )
+	if ( $key == 'test' )
 		print "";
 }
 
diff --git a/website/page/code/desktop-download.php b/website/page/code/desktop-download.php
new file mode 100644
index 00000000..8da7750c
--- /dev/null
+++ b/website/page/code/desktop-download.php
@@ -0,0 +1,68 @@
+.\2', $iitc_details['@version'] );
+
+	print "IITC version $iitc_version
\n";
+
+	print "Download\n";
+}
+
+
+function iitcDesktopPluginDownloadTable ( $path )
+{
+?>
+
+ 
+  
+   | Name | 
+   ID / Version | 
+   Description | 
+   Download | 
+  
+ 
+ 
+
+\n";
+
+	# remove 'IITC Plugin: ' prefix if it's there, for neatness
+	$name = preg_replace ( '/^IITC plugin: /i', '', $details['@name'] );
+
+	# format extended version info in less prominant font
+	$version = preg_replace ( '/^(\d+\.\d+\.\d+)\.(\d{8}\.\d{6})/', '\1.\2', $details['@version'] );
+
+	# remove unneeded prefix from description
+	$description = preg_replace ( '/^\[[^]]*\] */', '', $details['@description'] );
+
+	print "$name | ";
+	print "$basename $version | ";
+	print "$description | ";
+	print "Download | ";
+
+#	print "".$details['@name']." $name - version ".$details['@version'].": 
\n";
+#	print $details['@description'];
+
+	print "\n";
+}
+
+?>
+ 
+
+
+
diff --git a/website/page/code/userscript.php b/website/page/code/userscript.php
new file mode 100644
index 00000000..7fb570aa
--- /dev/null
+++ b/website/page/code/userscript.php
@@ -0,0 +1,32 @@
+
diff --git a/website/page/desktop.php b/website/page/desktop.php
index 805600c9..cbc37976 100644
--- a/website/page/desktop.php
+++ b/website/page/desktop.php
@@ -1,9 +1,7 @@
 IITC Browser Addon
 
 NOTE: the $path build is currently selected. Return to the standard build.";
+include_once ( "code/desktop-download.php" );
 ?>
 
 
@@ -51,16 +49,9 @@ Check your browser documentation for details on installing userscripts.
 
Download
 
 .\2', $iitc_details['@version'] );
+iitcDesktopDownload ( "release" );
 ?>
 
-
-IITC version 
-
-
-
Download
-
 
 
 
@@ -71,47 +62,6 @@ Plugins extend/modify the IITC experience. You do 
not need to install all
 a minority of users.
 
 
-
- 
-  
-   | Name | 
-   ID / Version | 
-   Description | 
-   Download | 
-  
- 
- 
-
 \n";
-
-	# remove 'IITC Plugin: ' prefix if it's there, for neatness
-	$name = preg_replace ( '/^IITC plugin: /i', '', $details['@name'] );
-
-	# format extended version info in less prominant font
-	$version = preg_replace ( '/^(\d+\.\d+\.\d+)\.(\d{8}\.\d{6})/', '\1.\2', $details['@version'] );
-
-	# remove unneeded prefix from description
-	$description = preg_replace ( '/^\[[^]]*\] */', '', $details['@description'] );
-
-	print "$name | ";
-	print "$basename $version | ";
-	print "$description | ";
-	print "Download | ";
-
-#	print "".$details['@name']." $name - version ".$details['@version'].": 
\n";
-#	print $details['@description'];
-
-	print "\n";
-}
-
+iitcDesktopPluginDownloadTable ( "release" );
 ?>
- 
-
-
diff --git a/website/page/test.php b/website/page/test.php
new file mode 100644
index 00000000..565df00e
--- /dev/null
+++ b/website/page/test.php
@@ -0,0 +1,63 @@
+
Test Builds
+
+
+These test builds are made available for those who would like to try the latest development code without
+needing to build it yourself. Automated scripts should update these builds within an hour of a change being
+committed to Github.
+
+
+
+Test builds are built automatically. They could be 
broken at any time. If you have any doubts about using
+unstable software, please use the standard 
desktop or 
mobile
+builds.
+
+
+
NOTE: A non-standard test build, 
$path, is currently selected. The notes 
may not apply! Return to the standard test build.
 ";
+
+
+$timestamp_file = $path . "/.build-timestamp";
+if ( file_exists ( $timestamp_file ) )
+{
+	$build_time = file_get_contents ( $timestamp_file );
+
+	print "The current test build was built at $build_time
";
+}
+else
+{
+}
+
+?>
+
+Desktop test build
+
+
+
+
+
+
+Desktop test plugins
+
+
+
+
+
+Mobile test build
+
+IITC Mobile version informpation - not currently available for test builds
+
+Download
+