diff --git a/editor.php b/editor.php
new file mode 100644
index 0000000..c645081
--- /dev/null
+++ b/editor.php
@@ -0,0 +1,58 @@
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+/*******************************************************************************
+ * Copyright (c) 2010 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: Adrian Mos
+ *    
+ *******************************************************************************/
+
+	$pageTitle 		= "Mangrove Editor - Connect your BPM and SOA Visually";
+	$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/default/style.css"/>');
+
+	$html  = <<<EOHTML
+<div id="midcolumn">
+<h2>$pageTitle</h2>
+<p>The new Mangrove Editor is almost ready! It allows graphical editing of the contents of your Mangrove instance. You can:
+	<ul>
+		<li>Inspect the SOA and BPM artifacts you have built in the workspace using Eclipse SOA editors</li>
+		<li>Create, Update or Delete elements such as business processes, activities and services</li>
+		<li>Connect to your SOA repository to get the most commonly used services that make sens in your workspace and have them available in the Mangrove palette</li>
+	</ul>
+	
+To get a glimpse of the functionalities of the new editor, read the scenario below.	
+	
+<h3>Mangrove Editor Usage Scenario</h3>
+This scenario involves the following steps:
+	<ol>
+		<li>Creation of a simple process in BPMN</li>
+		<li>Generation and visualization of the corresponding Mangrove instance in the Mangrove Editor</li>
+		<li>Adding services to the diagram from the Mangrove Editor palette</li>
+		<li>Connecting process steps to services</li>
+	</ol>
+
+<h3>Simple Process in BPMN</h3>
+<img src="images/travel-bpmn.jpg" style="float: left; margin-right: 8px;"/>
+
+<h3>Generation and Visualization of the Mangrove Instance</h3>
+<img src="images/mangrove-editor-services-empty.jpg" style="float: left; margin-right: 8px;"/>
+
+<h3>Adding Services</h3>
+Using an external wizard (not shown), the Mangrove palette can be enriched to contain services from the SOA repository that are widely used in the workspace.
+They can then be added to the actual Mangrove diagram, making them available for connections with business process' steps.
+
+<img src="images/mangrove-editor-added-services.jpg" style="float: left; margin-right: 8px;"/>
+
+<h3>Connecting Process Steps to Services</h3>
+Once the services are available in the diagram, they can be connected to the appropriate process activities. This would ensure they are visible in all the appropriate editors (BPMN, SCA or others) that need to be aware of these connections. 
+<img src="images/mangrove-editor-added-service-connections.jpg" style="float: left; margin-right: 8px;"/>
+
+
+</div>
+EOHTML;
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
\ No newline at end of file
diff --git a/images/mangrove-editor-added-service-connections.JPG b/images/mangrove-editor-added-service-connections.JPG
new file mode 100644
index 0000000..d1a9f82
--- /dev/null
+++ b/images/mangrove-editor-added-service-connections.JPG
Binary files differ
diff --git a/images/mangrove-editor-added-services.JPG b/images/mangrove-editor-added-services.JPG
new file mode 100644
index 0000000..5750cf0
--- /dev/null
+++ b/images/mangrove-editor-added-services.JPG
Binary files differ
diff --git a/images/mangrove-editor-services-empty.JPG b/images/mangrove-editor-services-empty.JPG
new file mode 100644
index 0000000..4b09f2b
--- /dev/null
+++ b/images/mangrove-editor-services-empty.JPG
Binary files differ
diff --git a/images/travel-bpmn.JPG b/images/travel-bpmn.JPG
new file mode 100644
index 0000000..4be0abd
--- /dev/null
+++ b/images/travel-bpmn.JPG
Binary files differ
diff --git a/pages/_index.html b/pages/_index.html
index 3224c93..e728562 100644
--- a/pages/_index.html
+++ b/pages/_index.html
@@ -41,6 +41,7 @@
 
 <div id="headlines">
 <h3>New and Noteworthy</h3>
+<p>The new <a href="editor.php">Mangrove Editor</a> is almost finished. You can use it to view and edit the contents of your Mangrove instance!</p>
 <p>Mangrove was presented at <a href="http://www.eclipsecon.org/2010/">EclipseCON 2010</a>. Check out the <a href="http://www.eclipsecon.org/2010/sessions/?page=sessions&id=1184">Mangrove overview presentation</a> 
 and the overall <a href="http://www.eclipsecon.org/2010/sessions/?page=sessions&id=1180">Eclipse SOA project presentation</a>.</p>
 </div>