diff --git a/chrome/content/zotero/tools/csledit.xul b/chrome/content/zotero/tools/csledit.xul
index 9f785c226..4385ff5cc 100644
--- a/chrome/content/zotero/tools/csledit.xul
+++ b/chrome/content/zotero/tools/csledit.xul
@@ -20,12 +20,14 @@
     
     ***** END LICENSE BLOCK *****
 -->
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
 
 <window
 	id="csl-edit"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="Zotero_CSL_Editor.init();">
+	onload="Zotero_CSL_Editor.init();"
+	title="Zotero Reference Test pane">
 	
 	<script src="chrome://zotero/content/include.js"/>
 	
@@ -43,6 +45,7 @@
 			this.handleKeyPress = handleKeyPress;
 			this.loadCSL = loadCSL;
 			this.generateBibliography = generateBibliography;
+			this.refresh = refresh;
 			
 			function init() {
 				var cslList = document.getElementById('zotero-csl-list');
@@ -51,14 +54,25 @@
 				}
 				
 				var csls = Zotero.DB.query("SELECT title, cslID FROM csl ORDER BY title");
-				
 				for (var i=0; i<csls.length; i++) {
 					cslList.appendItem(csls[i].title, csls[i].cslID);
 				}
+				var pageList = document.getElementById('zotero-csl-page-type');
+				var locators = Zotero.CSL.Global.getLocatorStrings();
+				for each(var type in locators) {
+					var locator = type;
+					locator = locator[0].toUpperCase()+locator.substr(1);
+					pageList.appendItem(locator, type);
+				}
 				
+				pageList.selectedIndex = 0;
 				cslList.setAttribute('initialized', true)
 			}
-			
+			function refresh() {
+				var editor = document.getElementById('zotero-csl-editor')
+				generateBibliography(editor.value)
+
+			}
 			
 			function handleKeyPress(event) {
 				if (event.keyCode == 9 &&
@@ -97,18 +111,30 @@
 				
 				// Generate multiple citations
 				var citation = csl.createCitation(itemSet.items);
-				var multCitations = csl.formatCitation(citation, "HTML");
-				
 				// Generate single citations
-				var citations = '';
+				var author = document.getElementById("preview-suppress-author").checked;
+				var search = document.getElementById('preview-pages');
+				var loc = document.getElementById('zotero-csl-page-type');
+				var pos = document.getElementById('preview-subsequent').checked ? Zotero.CSL.POSITION_SUBSEQUENT : Zotero.CSL.POSITION_FIRST;
+				var citations = '<h1>Single Citations</h1>';
 				for (var i=0; i<citation.citationItems.length; i++) {
+					citation.citationItems[i].suppressAuthor = author;
+					if (search.value != '') {
+						citation.citationItems[i].locator = search.value;
+						citation.citationItems[i].locatorType = loc.selectedItem.value;
+					}
+					citation.citationItems[i].position = pos;
 					citations += csl.formatCitation(csl.createCitation([citation.citationItems[i]]), "HTML") + '<br />';
 				}
-				
+				var multCitations = '<hr><h1>Multi Citations</h1>' +
+					csl.formatCitation(citation, "HTML");
+
 				// Generate bibliography
-				var bibliography = csl.formatBibliography(itemSet, "HTML");
+				var bibliography = '<hr/><h1>Bibliography</h1>' + 
+					csl.formatBibliography(itemSet, "HTML");
 				iframe.contentDocument.documentElement.innerHTML =
-					citations + '<hr/>' + multCitations + '<hr/>' + bibliography;
+					citations + 
+					multCitations + bibliography;
 			}
 			
 			
@@ -129,13 +155,21 @@
 	</script>
 	
 	<vbox flex="1">
-		<menulist id="zotero-csl-list" style="min-height: 1.6em" initialized="false" oncommand="Zotero_CSL_Editor.loadCSL(this.selectedItem.value)"/>
+		<hbox align="center">
+		    <button id="preview-refresh-button" label="Refresh" oncommand="Zotero_CSL_Editor.refresh()"/>
+		    <menulist id="zotero-csl-page-type" style="min-height: 1.6em; min-width: 50px" oncommand="Zotero_CSL_Editor.refresh()" />
+		    <label value=":" />
+		    <textbox size="5" id="preview-pages" type="timed" timeout="250" oncommand="Zotero_CSL_Editor.refresh()"/>
+		    <checkbox oncommand="Zotero_CSL_Editor.refresh()" id="preview-suppress-author" label="Suppress author" />
+		    <checkbox oncommand="Zotero_CSL_Editor.refresh()" id="preview-subsequent" label="Subsequent citation" />
+		    <menulist id="zotero-csl-list" style="min-height: 1.6em; min-width: 100px" initialized="false" flex="1" oncommand="Zotero_CSL_Editor.loadCSL(this.selectedItem.value)"/>
+		</hbox>
 		<textbox id="zotero-csl-editor" type="timed" timeout="250" multiline="true"
 			flex="1"
 			onkeypress="Zotero_CSL_Editor.handleKeyPress(event)"
 			oncommand="document.getElementById('zotero-csl-list').selectedIndex = -1; Zotero_CSL_Editor.generateBibliography(this.value)"/>
 		<splitter/>
-		<iframe id="zotero-csl-preview-box" flex="1" style="padding: 0 1em" overflow="auto"/>
+		<iframe id="zotero-csl-preview-box" flex="1" style="padding: 0 1em;background:white" overflow="auto"/>
 	</vbox>
 	
 </window>
diff --git a/chrome/content/zotero/tools/cslpreview.xul b/chrome/content/zotero/tools/cslpreview.xul
new file mode 100644
index 000000000..e62f2cd08
--- /dev/null
+++ b/chrome/content/zotero/tools/cslpreview.xul
@@ -0,0 +1,164 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright (c) 2006  Center for History and New Media
+                        George Mason University, Fairfax, Virginia, USA
+                        http://chnm.gmu.edu
+    
+    Licensed under the Educational Community License, Version 1.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.opensource.org/licenses/ecl1.php
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+    ***** END LICENSE BLOCK *****
+    Contributed by Julian Onions
+-->
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
+<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
+
+<window
+	id="csl-preview"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	onload="Zotero_CSL_Preview.init();"
+	title="Zotero Preview pane">
+	
+	<script src="chrome://zotero/content/include.js"/>
+	
+	<script>
+	<![CDATA[
+		default xml namespace = "http://purl.org/net/xbiblio/csl";
+
+		var Zotero_CSL_Preview = new function() {
+			var mainWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+				.getInterface(Components.interfaces.nsIWebNavigation)
+				.QueryInterface(Components.interfaces.nsIDocShellTreeItem)
+				.rootTreeItem
+				.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+				.getInterface(Components.interfaces.nsIDOMWindow);
+			
+			this.init = init;
+			this.refresh = refresh;
+			this.generateBibliography = generateBibliography;
+
+			function init() { 
+				//refresh(); 
+			}
+			function refresh() {
+				var iframe = document.getElementById('zotero-csl-preview-box');
+				var items = mainWindow.ZoteroPane.getSelectedItems();
+				if (items.length == 0) {
+					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
+					return;
+				}
+				var progressWin = new Zotero.ProgressWindow();
+				// XXX needs its own string really!
+				progressWin.changeHeadline(Zotero.getString("pane.items.menu.createBib.multiple"));
+				var icon = 'chrome://zotero/skin/treeitem-attachment-file.png';
+				progressWin.addLines(window.content.document.title, icon)
+				progressWin.show();
+				progressWin.startCloseTimer();
+				var f = function() {
+					var csls = Zotero.DB.query("SELECT title, csl FROM csl ORDER BY title");
+					// XXX needs its own string really for the title!
+					var str = '<html><head><title></title></head><body><h1>Citation/Bibliography list<h1>';
+					for (var i=0; i<csls.length; i++) {
+						Zotero.debug("Generate Bib for " + csls[i].title);
+						var cite = generateBibliography(csls[i].csl);
+						if (cite) {
+							str += '<hr><h2>' + csls[i].title + '</h2>';
+							str += cite;
+						}
+					}
+
+					str += '</body></html>';
+					iframe.contentDocument.documentElement.innerHTML = str;			
+				}
+				// Give progress window time to appear
+				setTimeout(f, 100);
+			}
+			 
+			function generateBibliography(str) {
+				var iframe = document.getElementById('zotero-csl-preview-box');
+				
+				var items = mainWindow.ZoteroPane.getSelectedItems();
+				if (items.length == 0) {
+					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
+					return;
+				}
+				
+				if (str.indexOf("<defaults") != -1) {
+					csl = new Zotero.CSL.Compat(str);
+				}
+				else {
+					csl = new Zotero.CSL(str);
+				}
+				var authordate = document.getElementById("format-author-date");
+				var numeric = document.getElementById("format-numeric");
+				Zotero.debug("style class is " + csl.class);
+				if (document.getElementById("format-note").checked == false && csl.class == "note") {
+					Zotero.debug("CSL IGNORE NOTE one");
+					return;
+				}
+				if (document.getElementById("format-in-text").checked == false && csl.class == "in-text") {
+					Zotero.debug("CSL IGNORE IN-TEXT one");
+					return;
+				}
+				var xmlinfo = csl._csl.info;
+				var terms = new Object();
+				for each(var cat in xmlinfo.category.@term) {
+					Zotero.debug("TERM is " + cat.toString());
+					terms[cat.toString()] = true;
+				}
+				if (!numeric.checked && terms["numeric"]) {
+					Zotero.debug("CSL IGNORE this numeric");
+					return;
+				}
+				if (!authordate.checked && terms["author-date"]) {
+					Zotero.debug("CSL IGNORE this AD");
+					return;
+				}
+				var itemSet = csl.createItemSet(items);
+				
+				// Generate multiple citations
+				var citation = csl.createCitation(itemSet.items);
+				var citations = csl.formatCitation(citation, "HTML");
+			
+				// Generate bibliography
+				var bibliography = '<p>' + csl.formatBibliography(itemSet, "HTML");
+				return citations + bibliography;
+			}
+			
+			
+		}
+	]]>
+	</script>
+	<!-- NEEDS LOCALISING -->
+	<vbox flex="1">
+	   <hbox >
+		<hbox align="center">
+			<button id="preview-refresh-button" label="Refresh" oncommand="Zotero_CSL_Preview.refresh()"/>
+			<groupbox orient="horizontal" align="center">
+				<label value="Class:"/>
+				<checkbox id="format-in-text" label="In-Text" checked="true"/>
+				<checkbox id="format-note" label="Notes" checked="true"/>
+			</groupbox>
+			<groupbox orient="horizontal" align="center">
+				<label value="Citation form:"/>
+				<checkbox id="format-author-date" label="Author Date" checked="true"/>
+				<checkbox id="format-numeric" label="Numeric" checked="true"/>
+			</groupbox>
+		</hbox>
+	   </hbox>
+	   <splitter/>
+	   <iframe id="zotero-csl-preview-box" flex="1" style="padding: 0 1em; background:white;" overflow="auto"/>
+	</vbox>
+	
+</window>