diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs
index 772bb1a180..efbcc2d76a 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs
@@ -457,30 +457,6 @@ namespace ICSharpCode.FormsDesigner
 			return compatibleMethods;
 		}
 		
-		public virtual ICollection GetCompatibleMethods(EventInfo edesc)
-		{
-			Reparse();
-			ArrayList compatibleMethods = new ArrayList();
-			MethodInfo methodInfo = edesc.GetAddMethod();
-			ParameterInfo pInfo = methodInfo.GetParameters()[0];
-			string eventName = pInfo.ParameterType.ToString().Replace("EventHandler", "EventArgs");
-			
-			foreach (IMethod method in completeClass.Methods) {
-				if (method.Parameters.Count == 2) {
-					bool found = true;
-					
-					IParameter p = method.Parameters[1];
-					if (p.ReturnType.FullyQualifiedName != eventName) {
-						found = false;
-					}
-					if (found) {
-						compatibleMethods.Add(method.Name);
-					}
-				}
-			}
-			return compatibleMethods;
-		}
-		
 		protected IField GetField(IClass c, string name)
 		{
 			foreach (IField field in c.Fields) {
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/IDesignerGenerator.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/IDesignerGenerator.cs
index 82147aeeb4..d30c85173e 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/IDesignerGenerator.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/IDesignerGenerator.cs
@@ -24,6 +24,5 @@ namespace ICSharpCode.FormsDesigner
 		void MergeFormChanges(CodeCompileUnit unit);
 		bool InsertComponentEvent(IComponent component, EventDescriptor edesc, string eventMethodName, string body, out string file, out int position);
 		ICollection GetCompatibleMethods(EventDescriptor edesc);
-		ICollection GetCompatibleMethods(EventInfo edesc);
 	}
 }
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
index d19c2275ff..d7f2aecf2c 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
@@ -337,11 +337,6 @@ namespace ICSharpCode.FormsDesigner
 			return generator.GetCompatibleMethods(edesc);
 		}
 		
-		public ICollection GetCompatibleMethods(EventInfo edesc)
-		{
-			return generator.GetCompatibleMethods(edesc);
-		}
-		
 		/*
 		protected override void OnViewActivated(EventArgs e)
 		{
diff --git a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/EventHandlerService.cs b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/EventHandlerService.cs
new file mode 100644
index 0000000000..c4ff83c607
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/EventHandlerService.cs
@@ -0,0 +1,62 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using ICSharpCode.WpfDesign;
+
+namespace StandaloneDesigner
+{
+	sealed class EventHandlerService : IEventHandlerService
+	{
+		Window1 mainWindow;
+		
+		public EventHandlerService(Window1 mainWindow)
+		{
+			this.mainWindow = mainWindow;
+		}
+		
+		public void CreateEventHandler(DesignItem item, DesignItemProperty eventProperty)
+		{
+			string handlerName = (string)eventProperty.ValueOnInstance;
+			if (string.IsNullOrEmpty(handlerName)) {
+				if (string.IsNullOrEmpty(item.Name)) {
+					// cannot create event for unnamed controls
+					if (mainWindow.propertyEditor.NameTextBox.Focus()) {
+						IErrorService errorService = item.Context.Services.GetService<IErrorService>();
+						if (errorService != null) {
+							Label errorLabel = new Label();
+							errorLabel.Content = "You need to give the " + item.ComponentType.Name + " a name.";
+							errorService.ShowErrorTooltip(mainWindow.propertyEditor.NameTextBox, errorLabel);
+						}
+					}
+					return;
+				}
+				
+				handlerName = item.Name + eventProperty.Name;
+				eventProperty.SetValue(handlerName);
+			}
+			
+			MessageBox.Show("show " + handlerName);
+		}
+		
+		public DesignItemProperty GetDefaultEvent(DesignItem item)
+		{
+			object[] attributes = item.ComponentType.GetCustomAttributes(typeof(DefaultEventAttribute), true);
+			if (attributes.Length == 1) {
+				DefaultEventAttribute dae = (DefaultEventAttribute)attributes[0];
+				DesignItemProperty property = item.Properties.GetProperty(dae.Name);
+				if (property != null && property.IsEvent) {
+					return property;
+				}
+			}
+			return null;
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/StandaloneDesigner.csproj b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/StandaloneDesigner.csproj
index 948580cdde..ffc74677a5 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/StandaloneDesigner.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/StandaloneDesigner.csproj
@@ -48,6 +48,7 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="EventHandlerService.cs" />
     <Compile Include="Toolbox.cs" />
     <Compile Include="Window1.xaml.cs">
       <SubType>Code</SubType>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml
index eda336f9b5..eef982e153 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml
@@ -1,5 +1,5 @@
 <Window x:Class="StandaloneDesigner.Window1"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:designer="clr-namespace:ICSharpCode.WpfDesign.Designer;assembly=ICSharpCode.WpfDesign.Designer"
         xmlns:my="clr-namespace:StandaloneDesigner"
@@ -22,7 +22,7 @@
 					         VerticalScrollBarVisibility="Auto"
 					         HorizontalScrollBarVisibility="Auto"
 					         xml:space="preserve"><![CDATA[
-<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Window xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="WindowTitle"
         BorderThickness="10" Width="400" Height="300">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs
index 79eb549b12..ac3f009c12 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs
@@ -8,6 +8,7 @@ using System.Xml;
 
 using ICSharpCode.WpfDesign;
 using ICSharpCode.WpfDesign.Designer;
+using ICSharpCode.WpfDesign.Designer.Xaml;
 using ICSharpCode.WpfDesign.PropertyEditor;
 using System.Threading;
 using System.Windows.Threading;
@@ -41,7 +42,13 @@ namespace StandaloneDesigner
 		{
 			if (e.Source != tabControl) return;
 			if (tabControl.SelectedItem == designTab) {
-				designSurface.LoadDesigner(new XmlTextReader(new StringReader(CodeTextBox.Text)), null);
+				XamlLoadSettings settings = new XamlLoadSettings();
+				settings.CustomServiceRegisterFunctions.Add(
+					delegate(XamlDesignContext context) {
+						context.Services.AddService(typeof(IEventHandlerService), new EventHandlerService(this));
+					});
+				
+				designSurface.LoadDesigner(new XmlTextReader(new StringReader(CodeTextBox.Text)), settings);
 				designSurface.DesignContext.Services.Selection.SelectionChanged += OnSelectionChanged;
 				toolbox.ToolService = designSurface.DesignContext.Services.Tool;
 			} else {
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/EventHandlerService.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/EventHandlerService.cs
new file mode 100644
index 0000000000..55e4f53a8b
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/EventHandlerService.cs
@@ -0,0 +1,89 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.ComponentModel;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.SharpDevelop.Dom;
+using ICSharpCode.Core;
+using System.Windows.Controls;
+
+namespace ICSharpCode.WpfDesign.AddIn
+{
+	sealed class EventHandlerService : IEventHandlerService
+	{
+		WpfViewContent viewContent;
+		
+		public EventHandlerService(WpfViewContent viewContent)
+		{
+			if (viewContent == null)
+				throw new ArgumentNullException("viewContent");
+			this.viewContent = viewContent;
+		}
+		
+		IProjectContent GetProjectContent()
+		{
+			IProject p = ProjectService.OpenSolution.FindProjectContainingFile(viewContent.PrimaryFileName);
+			if (p != null)
+				return ParserService.GetProjectContent(p) ?? ParserService.DefaultProjectContent;
+			else
+				return ParserService.DefaultProjectContent;
+		}
+		
+		public void CreateEventHandler(DesignItem item, DesignItemProperty eventProperty)
+		{
+			/*Designer.Xaml.XamlDesignContext xamlContext = item.Context as Designer.Xaml.XamlDesignContext;
+			if (xamlContext != null) {
+				string className = xamlContext.ClassName;
+				if (!string.IsNullOrEmpty(className)) {
+					IClass c = GetProjectContent().GetClass(className, 0);
+					if (c != null && !string.IsNullOrEmpty(c.CompilationUnit.FileName)) {
+						
+					}
+				}
+			}
+			
+			return;
+			*/
+			
+			string handlerName = (string)eventProperty.ValueOnInstance;
+			if (string.IsNullOrEmpty(handlerName)) {
+				if (string.IsNullOrEmpty(item.Name)) {
+					// cannot create event for unnamed controls
+					if (viewContent.PropertyEditor.NameTextBox.Focus()) {
+						IErrorService errorService = item.Context.Services.GetService<IErrorService>();
+						if (errorService != null) {
+							Label errorLabel = new Label();
+							errorLabel.Content = "You need to give the " + item.ComponentType.Name + " a name.";
+							errorService.ShowErrorTooltip(viewContent.PropertyEditor.NameTextBox, errorLabel);
+						}
+					}
+					return;
+				}
+				
+				handlerName = item.Name + eventProperty.Name;
+				eventProperty.SetValue(handlerName);
+			}
+			
+			//viewContent.PrimaryFileName + ".cs"
+		}
+		
+		public DesignItemProperty GetDefaultEvent(DesignItem item)
+		{
+			object[] attributes = item.ComponentType.GetCustomAttributes(typeof(DefaultEventAttribute), true);
+			if (attributes.Length == 1) {
+				DefaultEventAttribute dae = (DefaultEventAttribute)attributes[0];
+				DesignItemProperty property = item.Properties.GetProperty(dae.Name);
+				if (property != null && property.IsEvent) {
+					return property;
+				}
+			}
+			return null;
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfAndWinFormsTopLevelWindowService.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfAndWinFormsTopLevelWindowService.cs
new file mode 100644
index 0000000000..6c102df669
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfAndWinFormsTopLevelWindowService.cs
@@ -0,0 +1,77 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Interop;
+using System.Windows.Media;
+
+namespace ICSharpCode.WpfDesign.AddIn
+{
+	sealed class WpfAndWinFormsTopLevelWindowService : ITopLevelWindowService
+	{
+		public ITopLevelWindow GetTopLevelWindow(UIElement element)
+		{
+			Window window = Window.GetWindow(element);
+			if (window != null) {
+				return new WpfTopLevelWindow(window);
+			}
+			HwndSource hwndSource = PresentationSource.FromVisual(element) as HwndSource;
+			if (hwndSource != null) {
+				Control ctl = Control.FromChildHandle(hwndSource.Handle);
+				if (ctl != null) {
+					Form form = ctl.FindForm();
+					if (form != null) {
+						return new WindowsFormsTopLevelWindow(form);
+					}
+				}
+			}
+			return null;
+		}
+		
+		sealed class WpfTopLevelWindow : ITopLevelWindow
+		{
+			Window window;
+			
+			public WpfTopLevelWindow(Window window)
+			{
+				this.window = window;
+			}
+			
+			public void SetOwner(Window child)
+			{
+				child.Owner = window;
+			}
+			
+			public bool Activate()
+			{
+				return window.Activate();
+			}
+		}
+		
+		sealed class WindowsFormsTopLevelWindow : ITopLevelWindow
+		{
+			Form form;
+			
+			public WindowsFormsTopLevelWindow(Form form)
+			{
+				this.form = form;
+			}
+			
+			public void SetOwner(Window child)
+			{
+				(new WindowInteropHelper(child)).Owner = form.Handle;
+			}
+			
+			public bool Activate()
+			{
+				return form.Focus();
+			}
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
index d12a8d9a0f..36f00bb2ed 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
@@ -34,6 +34,7 @@ namespace ICSharpCode.WpfDesign.AddIn
 		public WpfViewContent(OpenedFile file) : base(file)
 		{
 			this.TabPageText = "${res:FormsDesigner.DesignTabPages.DesignTabPage}";
+			this.IsActiveViewContentChanged += OnIsActiveViewContentChanged;
 		}
 		
 		protected override void LoadInternal(OpenedFile file, System.IO.Stream stream)
@@ -53,12 +54,14 @@ namespace ICSharpCode.WpfDesign.AddIn
 				settings.CustomServiceRegisterFunctions.Add(
 					delegate(XamlDesignContext context) {
 						context.Services.AddService(typeof(IUriContext), new FileUriContext(this.PrimaryFile));
+						context.Services.AddService(typeof(IPropertyDescriptionService), new PropertyDescriptionService(this.PrimaryFile));
+						context.Services.AddService(typeof(IEventHandlerService), new EventHandlerService(this));
+						context.Services.AddService(typeof(ITopLevelWindowService), new WpfAndWinFormsTopLevelWindowService());
 					});
 				settings.TypeFinder = MyTypeFinder.Create(this.PrimaryFile);
 				
 				designer.LoadDesigner(r, settings);
 				
-				designer.DesignContext.Services.AddService(typeof(IPropertyDescriptionService), new PropertyDescriptionService(this.PrimaryFile));
 				designer.DesignContext.Services.Selection.SelectionChanged += OnSelectionChanged;
 				designer.DesignContext.Services.GetService<UndoService>().UndoStackChanged += OnUndoStackChanged;
 			}
@@ -66,8 +69,12 @@ namespace ICSharpCode.WpfDesign.AddIn
 		
 		protected override void SaveInternal(OpenedFile file, System.IO.Stream stream)
 		{
-			using (XmlTextWriter xmlWriter = new XmlTextWriter(stream, Encoding.UTF8)) {
-				xmlWriter.Formatting = Formatting.Indented;
+			XmlWriterSettings settings = new XmlWriterSettings();
+			settings.Encoding = Encoding.UTF8;
+			settings.Indent = true;
+			settings.IndentChars = ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.SharpDevelopTextEditorProperties.Instance.IndentationString;
+			settings.NewLineOnAttributes = true;
+			using (XmlWriter xmlWriter = XmlTextWriter.Create(stream, settings)) {
 				designer.SaveDesigner(xmlWriter);
 			}
 		}
@@ -116,6 +123,10 @@ namespace ICSharpCode.WpfDesign.AddIn
 			return true;
 		}
 		
+		public Designer.PropertyEditor PropertyEditor {
+			get { return propertyEditor; }
+		}
+		
 		PropertyContainer propertyContainer = new PropertyContainer();
 		
 		public PropertyContainer PropertyContainer {
@@ -133,12 +144,13 @@ namespace ICSharpCode.WpfDesign.AddIn
 			base.Dispose();
 		}
 		
-//		protected override void OnSwitchedTo(EventArgs e)
-//		{
-//			base.OnSwitchedTo(e);
-//			if (designer != null && designer.DesignContext != null) {
-//				WpfToolbox.Instance.ToolService = designer.DesignContext.Services.Tool;
-//			}
-//		}
+		void OnIsActiveViewContentChanged(object sender, EventArgs e)
+		{
+			if (IsActiveViewContent) {
+				if (designer != null && designer.DesignContext != null) {
+					WpfToolbox.Instance.ToolService = designer.DesignContext.Services.Tool;
+				}
+			}
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj
index 0485cf8262..df70da371e 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectGuid>{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +11,7 @@
     <NoStdLib>False</NoStdLib>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,10 +53,12 @@
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\EventHandlerService.cs" />
     <Compile Include="Src\FileUriContext.cs" />
     <Compile Include="Src\MyTypeFinder.cs" />
     <Compile Include="Src\PropertyDescriptionService.cs" />
     <Compile Include="Src\SharpDevelopElementHost.cs" />
+    <Compile Include="Src\WpfAndWinFormsTopLevelWindowService.cs" />
     <Compile Include="Src\WpfDisplayBinding.cs" />
     <Compile Include="Src\WpfSideTabItem.cs" />
     <Compile Include="Src\WpfToolbox.cs" />
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/EventHandlerEditor.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/EventHandlerEditor.cs
new file mode 100644
index 0000000000..168b7d54ce
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/EventHandlerEditor.cs
@@ -0,0 +1,80 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Controls;
+using ICSharpCode.WpfDesign.PropertyEditor;
+
+namespace ICSharpCode.WpfDesign.Designer.Controls
+{
+	/// <summary>
+	/// The combo box used to enter the event handler which an event is connected to.
+	/// </summary>
+	sealed class EventHandlerEditor : ComboBox
+	{
+		readonly IPropertyEditorDataEvent dataEvent;
+		
+		public EventHandlerEditor(IPropertyEditorDataEvent dataEvent)
+		{
+			this.dataEvent = dataEvent;
+			this.IsEditable = true;
+			
+			Loaded += delegate {
+				dataEvent.HandlerNameChanged += OnEventHandlerNameChanged;
+				OnEventHandlerNameChanged(null, null);
+			};
+			Unloaded += delegate {
+				dataEvent.HandlerNameChanged -= OnEventHandlerNameChanged;
+			};
+		}
+		
+		void OnEventHandlerNameChanged(object sender, EventArgs e)
+		{
+			this.Text = dataEvent.HandlerName;
+		}
+		
+		protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			
+			if (e.Handled)
+				return;
+			if (e.Key == Key.Enter) {
+				dataEvent.HandlerName = this.Text;
+				if (!string.IsNullOrEmpty(dataEvent.HandlerName)) {
+					dataEvent.GoToHandler();
+				}
+				e.Handled = true;
+			} else if (e.Key == Key.Escape) {
+				this.Text = dataEvent.HandlerName;
+				e.Handled = true;
+			}
+		}
+		
+		protected override void OnLostKeyboardFocus(KeyboardFocusChangedEventArgs e)
+		{
+			base.OnLostKeyboardFocus(e);
+			if (string.IsNullOrEmpty(this.Text))
+				dataEvent.HandlerName = null;
+			else
+				this.Text = dataEvent.HandlerName;
+		}
+		
+		protected override void OnMouseDoubleClick(MouseButtonEventArgs e)
+		{
+			e.Handled = true;
+			DoubleClick();
+		}
+		
+		public void DoubleClick()
+		{
+			dataEvent.GoToHandler();
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs
index 9e1089a890..92f04d7ec6 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs
@@ -79,7 +79,7 @@ namespace ICSharpCode.WpfDesign.Designer
 		
 		void ShowEventsButton_Click(object sender, RoutedEventArgs e)
 		{
-			
+			ShowEvents(this.EditedObject);
 		}
 		
 		bool useCategories = false;
@@ -92,7 +92,7 @@ namespace ICSharpCode.WpfDesign.Designer
 			
 			if (useCategories) {
 				List<PropertyEditorCategoryView> categories = new List<PropertyEditorCategoryView>();
-				foreach (IPropertyEditorDataProperty p in Func.Sort(dataSource.Properties, ComparePropertyNames)) {
+				foreach (IPropertyEditorDataProperty p in Func.Sort(dataSource.Properties, CompareMemberNames)) {
 					if (p.Name == "Name") {
 						continue;
 					}
@@ -111,7 +111,7 @@ namespace ICSharpCode.WpfDesign.Designer
 			} else {
 				PropertyGridView grid = new PropertyGridView();
 				contentStackPanel.Children.Add(grid);
-				foreach (IPropertyEditorDataProperty p in Func.Sort(dataSource.Properties, ComparePropertyNames)) {
+				foreach (IPropertyEditorDataProperty p in Func.Sort(dataSource.Properties, CompareMemberNames)) {
 					if (p.Name == "Name") {
 						continue;
 					}
@@ -120,7 +120,20 @@ namespace ICSharpCode.WpfDesign.Designer
 			}
 		}
 		
-		static int ComparePropertyNames(IPropertyEditorDataProperty p1, IPropertyEditorDataProperty p2)
+		void ShowEvents(IPropertyEditorDataSource dataSource)
+		{
+			contentStackPanel.Children.Clear();
+			if (dataSource == null)
+				return;
+			
+			PropertyGridView grid = new PropertyGridView();
+			contentStackPanel.Children.Add(grid);
+			foreach (IPropertyEditorDataEvent e in Func.Sort(dataSource.Events, CompareMemberNames)) {
+				grid.AddEvent(e);
+			}
+		}
+		
+		static int CompareMemberNames(IPropertyEditorDataMember p1, IPropertyEditorDataMember p2)
 		{
 			return p1.Name.CompareTo(p2.Name);
 		}
@@ -169,6 +182,20 @@ namespace ICSharpCode.WpfDesign.Designer
 				}
 			}
 		}
+		
+		void nameTextBox_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.Handled) return;
+			if (e.Key == Key.Enter) {
+				nameTextBox.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+			} else if (e.Key == Key.Escape) {
+				nameTextBox.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+			}
+		}
+		
+		public TextBox NameTextBox {
+			get { return nameTextBox; }
+		}
 	}
 }
 
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.xaml
index 665ecd0e57..6cd3b684f2 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.xaml
@@ -24,7 +24,8 @@
 							<RowDefinition Height="0.5*" />
 						</Grid.RowDefinitions>
 						<Label Grid.Column="0" Grid.Row="0" Target="{Binding ElementName=nameTextBox}">_Name:</Label>
-						<TextBox Grid.Column="1" Grid.Row="0" Name="nameTextBox" SizeChanged="nameTextBox_SizeChanged"
+						<TextBox Grid.Column="1" Grid.Row="0" Name="nameTextBox"
+						         SizeChanged="nameTextBox_SizeChanged" KeyDown="nameTextBox_KeyDown"
 						         Text="{Binding ElementName=userControl, Path=EditedObject.Name}"/>
 						<Label Grid.Column="0" Grid.Row="1">Type:</Label>
 						<Label Grid.Column="1" Grid.Row="1" Name="typeLabel"
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyGridView.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyGridView.cs
index e97b852f02..e5e1abd873 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyGridView.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyGridView.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Windows;
 using System.Windows.Documents;
+using System.Windows.Input;
 using System.Windows.Data;
 using System.Windows.Controls;
 using ICSharpCode.WpfDesign.PropertyEditor;
@@ -67,5 +68,35 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 			this.Children.Add(dotButton);
 			propertyNameText.ContextMenuProvider = dotButton;
 		}
+		
+		/// <summary>
+		/// Adds a new event to the PropertyGridView.
+		/// </summary>
+		public void AddEvent(IPropertyEditorDataEvent dataEvent)
+		{
+			this.RowDefinitions.Add(new RowDefinition());
+			
+			// Column 0: name of the event
+			PropertyNameTextBlock propertyNameText = new PropertyNameTextBlock(dataEvent);
+			propertyNameText.Margin = new Thickness(0, 0, 2, 0);
+			SetRow(propertyNameText, this.RowDefinitions.Count - 1);
+			SetColumn(propertyNameText, 0);
+			this.Children.Add(propertyNameText);
+			
+			// Column 1: the actual property editor
+			EventHandlerEditor editor = new EventHandlerEditor(dataEvent);
+			SetRow(editor, this.RowDefinitions.Count - 1);
+			SetColumn(editor, 1);
+			this.Children.Add(editor);
+			
+			propertyNameText.MouseDown += delegate(object sender, MouseButtonEventArgs e) {
+				if (e.ChangedButton == MouseButton.Left && e.ClickCount == 2) {
+					e.Handled = true;
+					editor.DoubleClick();
+				}
+			};
+			
+			// Column 2: empty
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyNameTextBlock.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyNameTextBlock.cs
index b5905d278a..4d406a7f49 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyNameTextBlock.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyNameTextBlock.cs
@@ -17,12 +17,12 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 	// Creates ToolTip and ContextMenu objects on-demand.
 	sealed class PropertyNameTextBlock : TextBlock
 	{
-		readonly IPropertyEditorDataProperty property;
+		readonly IPropertyEditorDataMember property;
 		readonly DockPanel toolTipDockPanel;
 		bool toolTipInitialized;
 		internal DependencyPropertyDotButton ContextMenuProvider;
 		
-		public PropertyNameTextBlock(IPropertyEditorDataProperty property)
+		public PropertyNameTextBlock(IPropertyEditorDataMember property)
 			: base(new Run(property.Name))
 		{
 			this.property = property;
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
index e5e3c825cf..2597b6ec95 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
@@ -155,6 +155,50 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 			get { return (WindowStyle)GetValue(Window.WindowStyleProperty); }
 			set { SetValue(Window.WindowStyleProperty, value); }
 		}
+		
+		#pragma warning disable 0067
+		// disable "event is never used" warning
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler Activated;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler Closed;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler Closing;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler ContentRendered;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler Deactivated;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler LocationChanged;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler SourceInitialized;
+		
+		/// <summary>
+		/// This event is never raised. (for compatibility with <see cref="Window"/> only).
+		/// </summary>
+		public event EventHandler StateChanged;
+		#pragma warning restore
 	}
 	
 	/// <summary>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/ContentControlDefaultInitializer.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/ContentControlDefaultInitializer.cs
new file mode 100644
index 0000000000..d80772191f
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/ContentControlDefaultInitializer.cs
@@ -0,0 +1,28 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.Windows.Controls;
+using ICSharpCode.WpfDesign.Extensions;
+
+namespace ICSharpCode.WpfDesign.Designer.Extensions
+{
+	/// <summary>
+	/// Description of ContentControlDefaultInitializer.
+	/// </summary>
+	[ExtensionFor(typeof(ContentControl))]
+	public sealed class ContentControlDefaultInitializer : DefaultInitializer
+	{
+		public override void InitializeDefaults(DesignItem item)
+		{
+			DesignItemProperty contentProperty = item.Properties["Content"];
+			if (contentProperty.ValueOnInstance == null) {
+				contentProperty.SetValue(item.ComponentType.Name);
+			}
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/PanelSelectionHandler.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/PanelSelectionHandler.cs
index 399cda0607..2dfb367a17 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/PanelSelectionHandler.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/PanelSelectionHandler.cs
@@ -34,7 +34,10 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 		
 		public void HandleSelectionMouseDown(IDesignPanel designPanel, MouseButtonEventArgs e, DesignPanelHitTestResult result)
 		{
-			new RangeSelectionGesture(result.ModelHit).Start(designPanel, e);
+			if (e.ChangedButton == MouseButton.Left && MouseGestureBase.IsOnlyButtonPressed(e, MouseButton.Left)) {
+				e.Handled = true;
+				new RangeSelectionGesture(result.ModelHit).Start(designPanel, e);
+			}
 		}
 	}
 	
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/CreateComponentTool.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/CreateComponentTool.cs
index 73617aa529..8b0935e701 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/CreateComponentTool.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/CreateComponentTool.cs
@@ -62,7 +62,9 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 		protected virtual DesignItem CreateItem(DesignContext context)
 		{
 			object newInstance = context.Services.ExtensionManager.CreateInstanceWithCustomInstanceFactory(componentType, null);
-			return context.Services.Component.RegisterComponentForDesigner(newInstance);
+			DesignItem item = context.Services.Component.RegisterComponentForDesigner(newInstance);
+			context.Services.ExtensionManager.ApplyDefaultInitializers(item);
+			return item;
 		}
 		
 		void OnDragOver(object sender, DragEventArgs e)
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/DragMoveMouseGesture.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/DragMoveMouseGesture.cs
index f11c386539..9d27d56556 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/DragMoveMouseGesture.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/DragMoveMouseGesture.cs
@@ -22,12 +22,14 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 		readonly DesignItem clickedOn;
 		PlacementOperation operation;
 		ICollection<DesignItem> selectedItems;
+		bool isDoubleClick;
 		
-		internal DragMoveMouseGesture(DesignItem clickedOn)
+		internal DragMoveMouseGesture(DesignItem clickedOn, bool isDoubleClick)
 		{
 			Debug.Assert(clickedOn != null);
 			
 			this.clickedOn = clickedOn;
+			this.isDoubleClick = isDoubleClick;
 			
 			if (clickedOn.Parent != null)
 				this.positionRelativeTo = clickedOn.Parent.View;
@@ -116,6 +118,11 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 		
 		protected override void OnMouseUp(object sender, MouseButtonEventArgs e)
 		{
+			if (!hasDragStarted && isDoubleClick) {
+				// user made a double-click
+				Debug.Assert(operation == null);
+				HandleDoubleClick();
+			}
 			if (operation != null) {
 				operation.Commit();
 				operation = null;
@@ -130,5 +137,18 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 				operation = null;
 			}
 		}
+		
+		void HandleDoubleClick()
+		{
+			if (selectedItems.Count == 1) {
+				IEventHandlerService ehs = services.GetService<IEventHandlerService>();
+				if (ehs != null) {
+					DesignItemProperty defaultEvent = ehs.GetDefaultEvent(clickedOn);
+					if (defaultEvent != null) {
+						ehs.CreateEventHandler(clickedOn, defaultEvent);
+					}
+				}
+			}
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/ErrorService.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/ErrorService.cs
index 9eb26408ce..16f414b47a 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/ErrorService.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/ErrorService.cs
@@ -52,6 +52,13 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 			}
 		}
 		
+		ServiceContainer services;
+		
+		public DefaultErrorService(DesignContext context)
+		{
+			this.services = context.Services;
+		}
+		
 		public void ShowErrorTooltip(FrameworkElement attachTo, UIElement errorElement)
 		{
 			if (attachTo == null)
@@ -64,8 +71,11 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 			b.Left = pos.X;
 			b.Top = pos.Y - 8;
 			b.Focusable = false;
-			Window ownerWindow = Window.GetWindow(attachTo);
-			b.Owner = ownerWindow;
+			ITopLevelWindowService windowService = services.GetService<ITopLevelWindowService>();
+			ITopLevelWindow ownerWindow = (windowService != null) ? windowService.GetTopLevelWindow(attachTo) : null;
+			if (ownerWindow != null) {
+				ownerWindow.SetOwner(b);
+			}
 			b.Show();
 			
 			if (ownerWindow != null) {
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/PointerTool.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/PointerTool.cs
index 618d319d0b..539e92f375 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/PointerTool.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/PointerTool.cs
@@ -30,19 +30,20 @@ namespace ICSharpCode.WpfDesign.Designer.Services
 		
 		void OnMouseDown(object sender, MouseButtonEventArgs e)
 		{
-			if (e.ChangedButton == MouseButton.Left && MouseGestureBase.IsOnlyButtonPressed(e, MouseButton.Left)) {
-				e.Handled = true;
-				IDesignPanel designPanel = (IDesignPanel)sender;
-				DesignPanelHitTestResult result = designPanel.HitTest(e.GetPosition(designPanel), false, true);
-				if (result.ModelHit != null) {
-					IHandlePointerToolMouseDown b = result.ModelHit.GetBehavior<IHandlePointerToolMouseDown>();
-					if (b != null) {
-						b.HandleSelectionMouseDown(designPanel, e, result);
-					} else {
+			IDesignPanel designPanel = (IDesignPanel)sender;
+			DesignPanelHitTestResult result = designPanel.HitTest(e.GetPosition(designPanel), false, true);
+			if (result.ModelHit != null) {
+				IHandlePointerToolMouseDown b = result.ModelHit.GetBehavior<IHandlePointerToolMouseDown>();
+				if (b != null) {
+					b.HandleSelectionMouseDown(designPanel, e, result);
+				}
+				if (!e.Handled) {
+					if (e.ChangedButton == MouseButton.Left && MouseGestureBase.IsOnlyButtonPressed(e, MouseButton.Left)) {
+						e.Handled = true;
 						ISelectionService selectionService = designPanel.Context.Services.Selection;
 						selectionService.SetSelectedComponents(new DesignItem[] { result.ModelHit }, SelectionTypes.Auto);
 						if (selectionService.IsComponentSelected(result.ModelHit)) {
-							new DragMoveMouseGesture(result.ModelHit).Start(designPanel, e);
+							new DragMoveMouseGesture(result.ModelHit, e.ClickCount == 2).Start(designPanel, e);
 						}
 					}
 				}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/WpfTopLevelWindowService.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/WpfTopLevelWindowService.cs
new file mode 100644
index 0000000000..8c67f26c61
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/WpfTopLevelWindowService.cs
@@ -0,0 +1,44 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.Windows;
+
+namespace ICSharpCode.WpfDesign.Designer.Services
+{
+	sealed class WpfTopLevelWindowService : ITopLevelWindowService
+	{
+		public ITopLevelWindow GetTopLevelWindow(System.Windows.UIElement element)
+		{
+			Window window = Window.GetWindow(element);
+			if (window != null)
+				return new WpfTopLevelWindow(window);
+			else
+				return null;
+		}
+		
+		sealed class WpfTopLevelWindow : ITopLevelWindow
+		{
+			Window window;
+			
+			public WpfTopLevelWindow(Window window)
+			{
+				this.window = window;
+			}
+			
+			public void SetOwner(Window child)
+			{
+				child.Owner = window;
+			}
+			
+			public bool Activate()
+			{
+				return window.Activate();
+			}
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
index 85940aca69..6f2c45d744 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
@@ -60,6 +60,7 @@
     <Compile Include="Controls\AdornerLayer.cs" />
     <Compile Include="Controls\ContainerDragHandle.cs" />
     <Compile Include="Controls\GridAdorner.cs" />
+    <Compile Include="Controls\PropertyEditor\EventHandlerEditor.cs" />
     <Compile Include="Controls\SelectionFrame.cs" />
     <Compile Include="Controls\ErrorBalloon.cs" />
     <Compile Include="Controls\GrayOutDesignerExceptActiveArea.cs" />
@@ -75,6 +76,7 @@
     <Compile Include="Controls\WindowClone.cs" />
     <Compile Include="DesignPanel.cs" />
     <Compile Include="DragDropExceptionHandler.cs" />
+    <Compile Include="Extensions\ContentControlDefaultInitializer.cs" />
     <Compile Include="Extensions\GridAdornerProvider.cs" />
     <Compile Include="Extensions\GridPlacementSupport.cs" />
     <Compile Include="ModelTools.cs" />
@@ -100,6 +102,7 @@
     <Compile Include="Services\UndoService.cs" />
     <Compile Include="Services\ViewService.cs" />
     <Compile Include="DesignSurface.cs" />
+    <Compile Include="Services\WpfTopLevelWindowService.cs" />
     <Compile Include="SharedInstances.cs" />
     <Compile Include="Xaml\XamlLoadSettings.cs" />
     <Compile Include="Xaml\XamlModelCollectionElementsCollection.cs" />
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs
index 04b0509af4..ae14218812 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignContext.cs
@@ -30,6 +30,14 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 			get { return _doc; }
 		}
 		
+		/// <summary>
+		/// Gets/Sets the value of the "x:class" property on the root item.
+		/// </summary>
+		public string ClassName {
+			get { return _doc.RootElement.GetXamlAttribute("class"); }
+			set { _doc.RootElement.SetXamlAttribute("class", value); }
+		}
+		
 		/// <summary>
 		/// Creates a new XamlDesignContext instance.
 		/// </summary>
@@ -43,7 +51,7 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 			this.Services.AddService(typeof(ISelectionService), new DefaultSelectionService());
 			this.Services.AddService(typeof(IToolService), new DefaultToolService(this));
 			this.Services.AddService(typeof(UndoService), new UndoService());
-			this.Services.AddService(typeof(IErrorService), new DefaultErrorService());
+			this.Services.AddService(typeof(IErrorService), new DefaultErrorService(this));
 			this.Services.AddService(typeof(ViewService), new DefaultViewService(this));
 			this.Services.AddService(typeof(OptionService), new OptionService());
 			
@@ -57,6 +65,11 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 				action(this);
 			}
 			
+			// register default versions of overridable services:
+			if (this.Services.GetService(typeof(ITopLevelWindowService)) == null) {
+				this.Services.AddService(typeof(ITopLevelWindowService), new WpfTopLevelWindowService());
+			}
+			
 			// register extensions from the designer assemblies:
 			foreach (Assembly designerAssembly in loadSettings.DesignerAssemblies) {
 				this.Services.ExtensionManager.RegisterAssembly(designerAssembly);
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelProperty.cs
index fea1b902b1..b5520fd4d6 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelProperty.cs
@@ -60,6 +60,10 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 			get { return _property.IsCollection; }
 		}
 		
+		public override bool IsEvent {
+			get { return _property.IsEvent; }
+		}
+		
 		public override Type ReturnType {
 			get { return _property.ReturnType; }
 		}
@@ -125,7 +129,9 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 		}
 		
 		public override object ValueOnInstance {
-			get { return _property.ValueOnInstance; }
+			get {
+					return _property.ValueOnInstance;
+			}
 			set { _property.ValueOnInstance = value; }
 		}
 		
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs
index f8f3809117..40701c6ca2 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs
@@ -62,6 +62,53 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
 			AssertLog("");
 		}
 		
+		[Test]
+		public void ButtonClickEventHandler()
+		{
+			DesignItem button = CreateCanvasContext("<Button Click='OnClick'/>");
+			Assert.AreEqual("OnClick", button.Properties["Click"].ValueOnInstance);
+			
+			button.Properties["Click"].Reset();
+			button.Properties["KeyDown"].SetValue("ButtonKeyDown");
+			
+			AssertCanvasDesignerOutput(@"<Button KeyDown=""ButtonKeyDown"" />", button.Context);
+			AssertLog("");
+		}
+		
+		[Test]
+		public void ButtonClickEventHandlerUndoRedo()
+		{
+			DesignItem button = CreateCanvasContext("<Button/>");
+			UndoService s = button.Context.Services.GetService<UndoService>();
+			Assert.IsFalse(s.CanUndo);
+			Assert.IsFalse(s.CanRedo);
+			button.Properties["Click"].SetValue("OnClick");
+			Assert.IsTrue(s.CanUndo);
+			Assert.IsFalse(s.CanRedo);
+			AssertCanvasDesignerOutput(@"<Button Click=""OnClick"" />", button.Context);
+			
+			button.Properties["Click"].SetValue("OnClick2");
+			Assert.IsTrue(s.CanUndo);
+			Assert.IsFalse(s.CanRedo);
+			AssertCanvasDesignerOutput(@"<Button Click=""OnClick2"" />", button.Context);
+			
+			s.Undo();
+			Assert.IsTrue(s.CanUndo);
+			Assert.IsTrue(s.CanRedo);
+			AssertCanvasDesignerOutput(@"<Button Click=""OnClick"" />", button.Context);
+			
+			s.Undo();
+			Assert.IsFalse(s.CanUndo);
+			Assert.IsTrue(s.CanRedo);
+			AssertCanvasDesignerOutput(@"<Button />", button.Context);
+			
+			s.Redo();
+			Assert.IsTrue(s.CanUndo);
+			Assert.IsTrue(s.CanRedo);
+			AssertCanvasDesignerOutput(@"<Button Click=""OnClick"" />", button.Context);
+			AssertLog("");
+		}
+		
 		[Test]
 		public void UndoRedoChangeGroupTest()
 		{
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
index 78e6cbebbb..8524a83b97 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
@@ -118,10 +118,18 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			}
 			PropertyDescriptorCollection propertyDescriptors = TypeDescriptor.GetProperties(instance);
 			PropertyDescriptor propertyInfo = propertyDescriptors[propertyName];
-			if (propertyInfo == null) {
-				throw new ArgumentException("The property '" + propertyName + "' doesn't exist on " + elementType.FullName, "propertyName");
+			XamlProperty newProperty;
+			if (propertyInfo != null) {
+				newProperty = new XamlProperty(this, new XamlNormalPropertyInfo(propertyInfo));
+			} else {
+				EventDescriptorCollection events = TypeDescriptor.GetEvents(instance);
+				EventDescriptor eventInfo = events[propertyName];
+				if (eventInfo != null) {
+					newProperty = new XamlProperty(this, new XamlEventPropertyInfo(eventInfo));
+				} else {
+					throw new ArgumentException("The property '" + propertyName + "' doesn't exist on " + elementType.FullName, "propertyName");
+				}
 			}
-			XamlProperty newProperty = new XamlProperty(this, new XamlNormalPropertyInfo(propertyInfo));
 			properties.Add(newProperty);
 			return newProperty;
 		}
@@ -148,5 +156,24 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			properties.Add(newProperty);
 			return newProperty;
 		}
+		
+		/// <summary>
+		/// Gets an attribute in the x:-namespace.
+		/// </summary>
+		public string GetXamlAttribute(string name)
+		{
+			return element.GetAttribute(name, XamlConstants.XamlNamespace);
+		}
+		
+		/// <summary>
+		/// Sets an attribute in the x:-namespace.
+		/// </summary>
+		public void SetXamlAttribute(string name, string value)
+		{
+			if (value == null)
+				element.RemoveAttribute(name, XamlConstants.XamlNamespace);
+			else
+				element.SetAttribute(name, XamlConstants.XamlNamespace, value);
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
index 30ac4279d3..a1c039434d 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
@@ -77,6 +77,13 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			get { return propertyInfo.IsAttached; }
 		}
 		
+		/// <summary>
+		/// Gets if this property is an event.
+		/// </summary>
+		public bool IsEvent {
+			get { return propertyInfo.IsEvent; }
+		}
+		
 		/// <summary>
 		/// Gets the return type of the property.
 		/// </summary>
@@ -276,8 +283,15 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		/// Gets/Sets the value of the property on the instance without updating the XAML document.
 		/// </summary>
 		public object ValueOnInstance {
-			get{
-				return propertyInfo.GetValue(parentObject.Instance);
+			get {
+				if (IsEvent) {
+					if (propertyValue != null)
+						return propertyValue.GetValueFor(null);
+					else
+						return null;
+				} else {
+					return propertyInfo.GetValue(parentObject.Instance);
+				}
 			}
 			set {
 				propertyInfo.SetValue(parentObject.Instance, value);
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlPropertyInfo.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlPropertyInfo.cs
index a641a91cdb..104230c949 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlPropertyInfo.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlPropertyInfo.cs
@@ -182,7 +182,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		
 		public override object GetValue(object instance)
 		{
-			return null;
+			throw new NotSupportedException();
 		}
 		
 		public override void SetValue(object instance, object value)
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs
index 5b7b569920..cf28f5b285 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs
@@ -54,6 +54,11 @@ namespace ICSharpCode.WpfDesign
 		/// </summary>
 		public abstract bool IsCollection { get; }
 		
+		/// <summary>
+		/// Gets if the property represents an event.
+		/// </summary>
+		public abstract bool IsEvent { get; }
+		
 		/// <summary>
 		/// Gets the elements represented by the collection.
 		/// </summary>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/ExtensionManager.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/ExtensionManager.cs
index 688a5b259f..072f683162 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/ExtensionManager.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Extensions/ExtensionManager.cs
@@ -217,7 +217,7 @@ namespace ICSharpCode.WpfDesign.Extensions
 		}
 		#endregion
 		
-		#region Special extensions (Instance Factory)
+		#region Special extensions (CustomInstanceFactory and DefaultInitializer)
 		static readonly object[] emptyObjectArray = new object[0];
 		
 		/// <summary>
@@ -239,6 +239,22 @@ namespace ICSharpCode.WpfDesign.Extensions
 			}
 			return CustomInstanceFactory.DefaultInstanceFactory.CreateInstance(instanceType, arguments);
 		}
+		
+		/// <summary>
+		/// Applies all DefaultInitializer extensions on the design item.
+		/// </summary>
+		public void ApplyDefaultInitializers(DesignItem item)
+		{
+			if (item == null)
+				throw new ArgumentNullException("item");
+			
+			foreach (ExtensionEntry entry in GetExtensionEntries(item)) {
+				if (typeof(DefaultInitializer).IsAssignableFrom(entry.ExtensionType)) {
+					DefaultInitializer initializer = (DefaultInitializer)Activator.CreateInstance(entry.ExtensionType);
+					initializer.InitializeDefaults(item);
+				}
+			}
+		}
 		#endregion
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataEvent.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataEvent.cs
new file mode 100644
index 0000000000..201384fb47
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataEvent.cs
@@ -0,0 +1,49 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision: 2667$</version>
+// </file>
+
+using System;
+using System.Diagnostics;
+
+namespace ICSharpCode.WpfDesign.PropertyEditor
+{
+	/// <summary>
+	/// wraps a DesignItemDataProperty (with IsEvent=true) for the property editor/grid.
+	/// </summary>
+	sealed class DesignItemDataEvent : DesignItemDataMember, IPropertyEditorDataEvent
+	{
+		internal DesignItemDataEvent(DesignItemDataSource ownerDataSource, DesignItemProperty property)
+			: base(ownerDataSource, property)
+		{
+			Debug.Assert(property.IsEvent);
+		}
+		
+		public event EventHandler HandlerNameChanged {
+			add { property.ValueChanged += value; }
+			remove { property.ValueChanged -= value; }
+		}
+		
+		public string HandlerName {
+			get {
+				return (string)property.ValueOnInstance;
+			}
+			set {
+				if (string.IsNullOrEmpty(value))
+					property.Reset();
+				else
+					property.SetValue(value);
+			}
+		}
+		
+		public void GoToHandler()
+		{
+			IEventHandlerService ehs = ownerDataSource.Services.GetService<IEventHandlerService>();
+			if (ehs != null) {
+				ehs.CreateEventHandler(ownerDataSource.DesignItem, property);
+			}
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataMember.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataMember.cs
new file mode 100644
index 0000000000..259afe8c4e
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataMember.cs
@@ -0,0 +1,61 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Diagnostics;
+
+namespace ICSharpCode.WpfDesign.PropertyEditor
+{
+	/// <summary>
+	/// wraps a DesignItemDataProperty for the property editor/grid.
+	/// </summary>
+	class DesignItemDataMember : IPropertyEditorDataMember
+	{
+		protected readonly DesignItemDataSource ownerDataSource;
+		protected readonly DesignItemProperty property;
+		
+		protected DesignItemDataMember(DesignItemDataSource ownerDataSource, DesignItemProperty property)
+		{
+			Debug.Assert(ownerDataSource != null);
+			Debug.Assert(property != null);
+			
+			this.ownerDataSource = ownerDataSource;
+			this.property = property;
+		}
+		
+		public IPropertyEditorDataSource OwnerDataSource {
+			get { return ownerDataSource; }
+		}
+		
+		public string Name {
+			get { return property.Name; }
+		}
+		
+		public object GetDescription()
+		{
+			IPropertyDescriptionService p = ownerDataSource.DesignItem.Services.GetService<IPropertyDescriptionService>();
+			if (p != null)
+				return p.GetDescription(property);
+			else
+				return null;
+		}
+		
+		/// <summary>
+		/// Gets the type that declares the property.
+		/// </summary>
+		public Type DeclaringType {
+			get { return property.DeclaringType; }
+		}
+		
+		/// <summary>
+		/// Gets the type of the property value.
+		/// </summary>
+		public Type ReturnType {
+			get { return property.ReturnType; }
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataProperty.cs
index d3cf33f7e4..84748feba4 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataProperty.cs
@@ -12,43 +12,20 @@ using System.Windows;
 namespace ICSharpCode.WpfDesign.PropertyEditor
 {
 	/// <summary>
-	/// wraps a DesignItemDataProperty for the property editor/grid.
+	/// wraps a DesignItemDataProperty (with IsEvent=false) for the property editor/grid.
 	/// </summary>
-	sealed class DesignItemDataProperty : IPropertyEditorDataProperty
+	sealed class DesignItemDataProperty : DesignItemDataMember, IPropertyEditorDataProperty
 	{
-		readonly DesignItemDataSource ownerDataSource;
-		readonly DesignItemProperty property;
-		
 		internal DesignItemDataProperty(DesignItemDataSource ownerDataSource, DesignItemProperty property)
+			: base(ownerDataSource, property)
 		{
-			Debug.Assert(ownerDataSource != null);
-			Debug.Assert(property != null);
-			
-			this.ownerDataSource = ownerDataSource;
-			this.property = property;
-		}
-		
-		public IPropertyEditorDataSource OwnerDataSource {
-			get { return ownerDataSource; }
+			Debug.Assert(!property.IsEvent);
 		}
 		
 		public string Category {
 			get { return property.Category; }
 		}
 		
-		public string Name {
-			get { return property.Name; }
-		}
-		
-		public object GetDescription()
-		{
-			IPropertyDescriptionService p = ownerDataSource.DesignItem.Services.GetService<IPropertyDescriptionService>();
-			if (p != null)
-				return p.GetDescription(property);
-			else
-				return null;
-		}
-		
 		public System.ComponentModel.TypeConverter TypeConverter {
 			get { return property.TypeConverter; }
 		}
@@ -92,20 +69,6 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 			remove { property.ValueChanged -= value; }
 		}
 		
-		/// <summary>
-		/// Gets the type of the property value.
-		/// </summary>
-		public Type ReturnType {
-			get { return property.ReturnType; }
-		}
-		
-		/// <summary>
-		/// Gets the type that declares the property.
-		/// </summary>
-		public Type DeclaringType {
-			get { return property.DeclaringType; }
-		}
-		
 		public bool CanUseCustomExpression {
 			get {
 				return true;
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataSource.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataSource.cs
index da236d287b..c6adae26e2 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataSource.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/DesignItemDataSource.cs
@@ -6,11 +6,11 @@
 // </file>
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Media;
-using System.Collections.Generic;
 
 namespace ICSharpCode.WpfDesign.PropertyEditor
 {
@@ -21,6 +21,7 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 	{
 		readonly DesignItem item;
 		readonly List<IPropertyEditorDataProperty> properties = new List<IPropertyEditorDataProperty>();
+		readonly List<IPropertyEditorDataEvent> events = new List<IPropertyEditorDataEvent>();
 		
 		#region Available properties
 		// cache properties available for a type - retrieving this list takes ~100ms on my machine, so
@@ -50,6 +51,32 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 		}
 		#endregion
 		
+		#region Available events
+		// cache events available for a type
+		static readonly Dictionary<Type, string[]> availableEvents = new Dictionary<Type, string[]>();
+		
+		static string[] GetAvailableEvents(Type forType)
+		{
+			Debug.Assert(forType != null);
+			string[] result;
+			lock (availableEvents) {
+				if (availableEvents.TryGetValue(forType, out result))
+					return result;
+			}
+			List<string> names = new List<string>();
+			foreach (EventDescriptor p in TypeDescriptor.GetEvents(forType)) {
+				if (!p.IsBrowsable) continue;
+				if (p.Name.Contains(".")) continue;
+				names.Add(p.Name);
+			}
+			result = names.ToArray();
+			lock (availableEvents) {
+				availableEvents[forType] = result;
+			}
+			return result;
+		}
+		#endregion
+		
 		/// <summary>
 		/// Constructs a new DesignItemDataSource for the specified design item.
 		/// </summary>
@@ -63,10 +90,17 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 			foreach (string name in GetAvailableProperties(item.ComponentType)) {
 				designItemProperties.Add(item.Properties[name]);
 			}
+			foreach (string name in GetAvailableEvents(item.ComponentType)) {
+				designItemProperties.Add(item.Properties[name]);
+			}
 			designItemProperties.AddRange(item.Properties);
 			
 			foreach (DesignItemProperty p in Func.Distinct(designItemProperties)) {
-				properties.Add(new DesignItemDataProperty(this, p));
+				if (p.IsEvent) {
+					events.Add(new DesignItemDataEvent(this, p));
+				} else {
+					properties.Add(new DesignItemDataProperty(this, p));
+				}
 			}
 		}
 		
@@ -139,6 +173,11 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 			get { return properties.AsReadOnly(); }
 		}
 		
+		/// <summary>See <see cref="IPropertyEditorDataSource"/></summary>
+		public ICollection<IPropertyEditorDataEvent> Events {
+			get { return events.AsReadOnly(); }
+		}
+		
 		/// <summary>See <see cref="IPropertyEditorDataSource"/></summary>
 		public bool CanAddAttachedProperties {
 			get {
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/IPropertyEditorDataSource.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/IPropertyEditorDataSource.cs
index 5007df97cf..c5fadc63d3 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/IPropertyEditorDataSource.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/IPropertyEditorDataSource.cs
@@ -43,6 +43,11 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 		/// </summary>
 		ICollection<IPropertyEditorDataProperty> Properties { get; }
 		
+		/// <summary>
+		/// Gets the collection of events.
+		/// </summary>
+		ICollection<IPropertyEditorDataEvent> Events { get; }
+		
 		/// <summary>
 		/// Gets if adding attached properties is supported.
 		/// </summary>
@@ -60,39 +65,29 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 	}
 	
 	/// <summary>
-	/// Represents a property inside a <see cref="IPropertyEditorDataSource"/>.
+	/// Represents a property or event inside a <see cref="IPropertyEditorDataSource"/>.
 	/// </summary>
-	public interface IPropertyEditorDataProperty
+	public interface IPropertyEditorDataMember
 	{
 		/// <summary>
 		/// Gets the data source that own this property.
 		/// </summary>
 		IPropertyEditorDataSource OwnerDataSource { get; }
 		
-		/// <summary>
-		/// Gets the category this property uses.
-		/// </summary>
-		string Category { get; }
-		
 		/// <summary>
 		/// Gets the name of the property.
 		/// </summary>
 		string Name { get; }
 		
-		/// <summary>
-		/// Gets the type of the property value.
-		/// </summary>
-		Type ReturnType { get; }
-		
 		/// <summary>
 		/// Gets the type that declares the property.
 		/// </summary>
 		Type DeclaringType { get; }
 		
 		/// <summary>
-		/// Gets the type converter used to convert property values to/from string.
+		/// Gets the type of the property value / the type of the event delegate.
 		/// </summary>
-		TypeConverter TypeConverter { get; }
+		Type ReturnType { get; }
 		
 		/// <summary>
 		/// Gets the description of the property. The returned object should be something that
@@ -100,6 +95,22 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 		/// </summary>
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
 		object GetDescription(); // is not a property because it can create a new instance on every call
+	}
+	
+	/// <summary>
+	/// Represents a property inside a <see cref="IPropertyEditorDataSource"/>.
+	/// </summary>
+	public interface IPropertyEditorDataProperty : IPropertyEditorDataMember
+	{
+		/// <summary>
+		/// Gets the category this property uses.
+		/// </summary>
+		string Category { get; }
+		
+		/// <summary>
+		/// Gets the type converter used to convert property values to/from string.
+		/// </summary>
+		TypeConverter TypeConverter { get; }
 		
 		/// <summary>
 		/// Gets/Sets if the property has been assigned a local value.
@@ -143,4 +154,25 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 		/// </summary>
 		UIElement CreateEditor();
 	}
+	
+	/// <summary>
+	/// Represents an event inside a <see cref="IPropertyEditorDataSource"/>.
+	/// </summary>
+	public interface IPropertyEditorDataEvent : IPropertyEditorDataMember
+	{
+		/// <summary>
+		/// Gets/Sets the name of the event handler.
+		/// </summary>
+		string HandlerName { get; set; }
+		
+		/// <summary>
+		/// Is raised when the HandlerName property has changed.
+		/// </summary>
+		event EventHandler HandlerNameChanged;
+		
+		/// <summary>
+		/// Goes to the event handler, creating it when necessary.
+		/// </summary>
+		void GoToHandler();
+	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/MultipleSelectionDataSource.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/MultipleSelectionDataSource.cs
index 3631153fb5..504224f721 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/MultipleSelectionDataSource.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/PropertyEditor/MultipleSelectionDataSource.cs
@@ -134,5 +134,10 @@ namespace ICSharpCode.WpfDesign.PropertyEditor
 		{
 			return null;
 		}
+		
+		/// <summary>See <see cref="IPropertyEditorDataSource"/></summary>
+		public ICollection<IPropertyEditorDataEvent> Events {
+			get { return new IPropertyEditorDataEvent[0]; }
+		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs
index 571cc1732e..adb2fe56fc 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/Services.cs
@@ -141,7 +141,7 @@ namespace ICSharpCode.WpfDesign
 		}
 	}
 	#endregion
-
+	
 	#region IPropertyDescriptionService
 	/// <summary>
 	/// Used to get a description for properties.
@@ -167,4 +167,54 @@ namespace ICSharpCode.WpfDesign
 		void ShowErrorTooltip(FrameworkElement attachTo, UIElement errorElement);
 	}
 	#endregion
+	
+	#region IEventHandlerService
+	/// <summary>
+	/// Service for providing the designer with information about available event handlers.
+	/// </summary>
+	public interface IEventHandlerService
+	{
+		/// <summary>
+		/// Creates an event handler for the specified event.
+		/// </summary>
+		void CreateEventHandler(DesignItem item, DesignItemProperty eventProperty);
+		
+		/// <summary>
+		/// Gets the default event of the specified design item.
+		/// </summary>
+		DesignItemProperty GetDefaultEvent(DesignItem item);
+	}
+	#endregion
+	
+	#region ITopLevelWindowService
+	/// <summary>
+	/// Represents a top level window.
+	/// </summary>
+	public interface ITopLevelWindow
+	{
+		/// <summary>
+		/// Sets child.Owner to the top level window.
+		/// </summary>
+		void SetOwner(Window child);
+		
+		/// <summary>
+		/// Activates the window.
+		/// </summary>
+		bool Activate();
+	}
+	
+	/// <summary>
+	/// Provides a method to get the top-level-window of any UIElement.
+	/// If the WPF Designer is hosted inside a Windows.Forms application, the hosting environment
+	/// should specify a ITopLevelWindowService implementation that works with <b>both</b> WPF and Windows.Forms
+	/// top-level-windows.
+	/// </summary>
+	public interface ITopLevelWindowService
+	{
+		/// <summary>
+		/// Gets the top level window that contains the specified element.
+		/// </summary>
+		ITopLevelWindow GetTopLevelWindow(UIElement element);
+	}
+	#endregion
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj
index bbf8e8e81d..c076e540d9 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj
@@ -89,6 +89,8 @@
     <Compile Include="PlacementOperation.cs" />
     <Compile Include="PlacementType.cs" />
     <Compile Include="PropertyEditor\BooleanEditor.cs" />
+    <Compile Include="PropertyEditor\DesignItemDataEvent.cs" />
+    <Compile Include="PropertyEditor\DesignItemDataMember.cs" />
     <Compile Include="PropertyEditor\MultipleSelectionDataProperty.cs" />
     <Compile Include="PropertyEditor\ProxyPropertyEditorDataProperty.cs" />
     <Compile Include="PropertyEditor\StandardValuesComboBoxEditor.cs" />
diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/KeywordList.txt b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/KeywordList.txt
index e832cefa31..2438d225cf 100644
--- a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/KeywordList.txt
+++ b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/KeywordList.txt
@@ -186,7 +186,7 @@ OverloadableBinaryOp("+", "-", "*", "/", "%", "&", "|", "^", "<<", "==", "!=", "
 TypeKW("char", "bool", "object", "string", "sbyte", "byte", "short", "ushort", "int", "uint", "long", "ulong", "float", "double", "decimal")
 UnaryHead("+", "-", "!", "~", "*", "++", "--", "&")
 AssnStartOp("+", "-", "!", "~", "*")
-CastFollower(@IdentifierTokens, Literal, "(", "new", "this", "base", "null", "checked", "unchecked", "typeof", "sizeof", "delegate", @OverloadableUnaryOp, @UnaryOp)
+CastFollower(@SimpleTypeName, Literal, "(", "~", "!", @ExpressionStart)
 AssgnOps("=", "+=", "-=", "*=", "/=", "%=", "&=", "|=", "<<=")
 UnaryOp("+", "-", "!", "~", "*", "++", "--", "&")
 TypeDeclarationKW("class", "interface", "struct", "enum", "delegate")
diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Tokens.cs b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Tokens.cs
index 6d4911400f..0a6e1d32bb 100644
--- a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Tokens.cs
+++ b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Tokens.cs
@@ -172,7 +172,7 @@ namespace ICSharpCode.NRefactory.Parser.CSharp
 		public static BitArray TypeKW = NewSet(Char, Bool, Object, String, Sbyte, Byte, Short, Ushort, Int, Uint, Long, Ulong, Float, Double, Decimal);
 		public static BitArray UnaryHead = NewSet(Plus, Minus, Not, BitwiseComplement, Times, Increment, Decrement, BitwiseAnd);
 		public static BitArray AssnStartOp = NewSet(Plus, Minus, Not, BitwiseComplement, Times);
-		public static BitArray CastFollower = NewSet(Identifier, Partial, Where, Get, Set, Add, Remove, Yield, Select, Group, By, Into, From, Ascending, Descending, Orderby, Let, Join, On, Equals, Literal, OpenParenthesis, New, This, Base, Null, Checked, Unchecked, Typeof, Sizeof, Delegate, Minus, Not, BitwiseComplement, Increment, Decrement, True, False, Plus, Minus, Not, BitwiseComplement, Times, Increment, Decrement, BitwiseAnd);
+		public static BitArray CastFollower = NewSet(Char, Bool, Object, String, Sbyte, Byte, Short, Ushort, Int, Uint, Long, Ulong, Float, Double, Decimal, Identifier, Partial, Where, Get, Set, Add, Remove, Yield, Select, Group, By, Into, From, Ascending, Descending, Orderby, Let, Join, On, Equals, Void, Literal, OpenParenthesis, BitwiseComplement, Not, Base, Delegate, False, New, Null, Sizeof, This, True, Typeof, Checked, Unchecked, From);
 		public static BitArray AssgnOps = NewSet(Assign, PlusAssign, MinusAssign, TimesAssign, DivAssign, ModAssign, BitwiseAndAssign, BitwiseOrAssign, ShiftLeftAssign);
 		public static BitArray UnaryOp = NewSet(Plus, Minus, Not, BitwiseComplement, Times, Increment, Decrement, BitwiseAnd);
 		public static BitArray TypeDeclarationKW = NewSet(Class, Interface, Struct, Enum, Delegate);
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs
index 7027918b11..83a4a3a28a 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs
@@ -213,10 +213,18 @@ namespace ICSharpCode.NRefactory.Parser.CSharp
 			}
 			// check successor
 			pt = Peek();
-			return Tokens.CastFollower[pt.kind] || (Tokens.TypeKW[pt.kind] && lexer.Peek().kind == Tokens.Dot);
+			return Tokens.CastFollower[pt.kind];
 		}
 		// END IsTypeCast
 		
+		// Gets if the token is a possible token for an expression start
+		// Is used to determine if "a is Type ? token" a the start of a ternary
+		// expression or a type test for Nullable<Type>
+		bool IsPossibleExpressionStart(int token)
+		{
+			return Tokens.CastFollower[token] || Tokens.UnaryOp[token];
+		}
+		
 		// ( { [TypeNameOrKWForTypeCast] ident "," } )
 		bool IsLambdaExpression()
 		{
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
index 123525e08e..c8725b1f04 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
@@ -444,60 +444,60 @@ out expr);
 	}
 
 	void Expr(
-#line  1667 "cs.ATG" 
+#line  1670 "cs.ATG" 
 out Expression expr) {
 
-#line  1668 "cs.ATG" 
+#line  1671 "cs.ATG" 
 		expr = null; Expression expr1 = null, expr2 = null; AssignmentOperatorType op; 
 		UnaryExpr(
-#line  1670 "cs.ATG" 
+#line  1673 "cs.ATG" 
 out expr);
 		if (StartOf(7)) {
 			AssignmentOperator(
-#line  1673 "cs.ATG" 
+#line  1676 "cs.ATG" 
 out op);
 			Expr(
-#line  1673 "cs.ATG" 
+#line  1676 "cs.ATG" 
 out expr1);
 
-#line  1673 "cs.ATG" 
+#line  1676 "cs.ATG" 
 			expr = new AssignmentExpression(expr, op, expr1); 
 		} else if (
-#line  1674 "cs.ATG" 
+#line  1677 "cs.ATG" 
 la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) {
 			AssignmentOperator(
-#line  1675 "cs.ATG" 
+#line  1678 "cs.ATG" 
 out op);
 			Expr(
-#line  1675 "cs.ATG" 
+#line  1678 "cs.ATG" 
 out expr1);
 
-#line  1675 "cs.ATG" 
+#line  1678 "cs.ATG" 
 			expr = new AssignmentExpression(expr, op, expr1); 
 		} else if (StartOf(8)) {
 			ConditionalOrExpr(
-#line  1677 "cs.ATG" 
+#line  1680 "cs.ATG" 
 ref expr);
 			if (la.kind == 13) {
 				lexer.NextToken();
 				Expr(
-#line  1678 "cs.ATG" 
+#line  1681 "cs.ATG" 
 out expr1);
 
-#line  1678 "cs.ATG" 
+#line  1681 "cs.ATG" 
 				expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); 
 			}
 			if (la.kind == 12) {
 				lexer.NextToken();
 				Expr(
-#line  1679 "cs.ATG" 
+#line  1682 "cs.ATG" 
 out expr1);
 				Expect(9);
 				Expr(
-#line  1679 "cs.ATG" 
+#line  1682 "cs.ATG" 
 out expr2);
 
-#line  1679 "cs.ATG" 
+#line  1682 "cs.ATG" 
 				expr = new ConditionalExpression(expr, expr1, expr2);  
 			}
 		} else SynErr(150);
@@ -900,39 +900,39 @@ templates);
 	}
 
 	void TypeParameterList(
-#line  2186 "cs.ATG" 
+#line  2189 "cs.ATG" 
 List<TemplateDefinition> templates) {
 
-#line  2188 "cs.ATG" 
+#line  2191 "cs.ATG" 
 		AttributeSection section;
 		List<AttributeSection> attributes = new List<AttributeSection>();
 		
 		Expect(23);
 		while (la.kind == 18) {
 			AttributeSection(
-#line  2192 "cs.ATG" 
+#line  2195 "cs.ATG" 
 out section);
 
-#line  2192 "cs.ATG" 
+#line  2195 "cs.ATG" 
 			attributes.Add(section); 
 		}
 		Identifier();
 
-#line  2193 "cs.ATG" 
+#line  2196 "cs.ATG" 
 		templates.Add(new TemplateDefinition(t.val, attributes)); 
 		while (la.kind == 14) {
 			lexer.NextToken();
 			while (la.kind == 18) {
 				AttributeSection(
-#line  2194 "cs.ATG" 
+#line  2197 "cs.ATG" 
 out section);
 
-#line  2194 "cs.ATG" 
+#line  2197 "cs.ATG" 
 				attributes.Add(section); 
 			}
 			Identifier();
 
-#line  2195 "cs.ATG" 
+#line  2198 "cs.ATG" 
 			templates.Add(new TemplateDefinition(t.val, attributes)); 
 		}
 		Expect(22);
@@ -965,22 +965,22 @@ out typeRef, false);
 	}
 
 	void TypeParameterConstraintsClause(
-#line  2199 "cs.ATG" 
+#line  2202 "cs.ATG" 
 List<TemplateDefinition> templates) {
 
-#line  2200 "cs.ATG" 
+#line  2203 "cs.ATG" 
 		string name = ""; TypeReference type; 
 		Expect(127);
 		Identifier();
 
-#line  2203 "cs.ATG" 
+#line  2206 "cs.ATG" 
 		name = t.val; 
 		Expect(9);
 		TypeParameterConstraintsClauseBase(
-#line  2205 "cs.ATG" 
+#line  2208 "cs.ATG" 
 out type);
 
-#line  2206 "cs.ATG" 
+#line  2209 "cs.ATG" 
 		TemplateDefinition td = null;
 		foreach (TemplateDefinition d in templates) {
 			if (d.Name == name) {
@@ -993,10 +993,10 @@ out type);
 		while (la.kind == 14) {
 			lexer.NextToken();
 			TypeParameterConstraintsClauseBase(
-#line  2215 "cs.ATG" 
+#line  2218 "cs.ATG" 
 out type);
 
-#line  2216 "cs.ATG" 
+#line  2219 "cs.ATG" 
 			td = null;
 			foreach (TemplateDefinition d in templates) {
 				if (d.Name == name) {
@@ -1330,33 +1330,33 @@ out r, canBeUnbound);
 	}
 
 	void TypeName(
-#line  2129 "cs.ATG" 
+#line  2132 "cs.ATG" 
 out TypeReference typeRef, bool canBeUnbound) {
 
-#line  2130 "cs.ATG" 
+#line  2133 "cs.ATG" 
 		List<TypeReference> typeArguments = null;
 		string alias = null;
 		string qualident;
 		
 		if (
-#line  2135 "cs.ATG" 
+#line  2138 "cs.ATG" 
 IdentAndDoubleColon()) {
 			Identifier();
 
-#line  2136 "cs.ATG" 
+#line  2139 "cs.ATG" 
 			alias = t.val; 
 			Expect(10);
 		}
 		Qualident(
-#line  2139 "cs.ATG" 
+#line  2142 "cs.ATG" 
 out qualident);
 		if (la.kind == 23) {
 			TypeArgumentList(
-#line  2140 "cs.ATG" 
+#line  2143 "cs.ATG" 
 out typeArguments, canBeUnbound);
 		}
 
-#line  2142 "cs.ATG" 
+#line  2145 "cs.ATG" 
 		if (alias == null) {
 		typeRef = new TypeReference(qualident, typeArguments);
 		} else if (alias == "global") {
@@ -1367,22 +1367,22 @@ out typeArguments, canBeUnbound);
 		}
 		
 		while (
-#line  2151 "cs.ATG" 
+#line  2154 "cs.ATG" 
 DotAndIdent()) {
 			Expect(15);
 
-#line  2152 "cs.ATG" 
+#line  2155 "cs.ATG" 
 			typeArguments = null; 
 			Qualident(
-#line  2153 "cs.ATG" 
+#line  2156 "cs.ATG" 
 out qualident);
 			if (la.kind == 23) {
 				TypeArgumentList(
-#line  2154 "cs.ATG" 
+#line  2157 "cs.ATG" 
 out typeArguments, canBeUnbound);
 			}
 
-#line  2155 "cs.ATG" 
+#line  2158 "cs.ATG" 
 			typeRef = new InnerClassTypeReference(typeRef, qualident, typeArguments); 
 		}
 	}
@@ -2499,14 +2499,14 @@ out name);
 	}
 
 	void NullableQuestionMark(
-#line  2160 "cs.ATG" 
+#line  2163 "cs.ATG" 
 ref TypeReference typeRef) {
 
-#line  2161 "cs.ATG" 
+#line  2164 "cs.ATG" 
 		List<TypeReference> typeArguments = new List<TypeReference>(1); 
 		Expect(12);
 
-#line  2165 "cs.ATG" 
+#line  2168 "cs.ATG" 
 		if (typeRef != null) typeArguments.Add(typeRef);
 		typeRef = new TypeReference("System.Nullable", typeArguments);
 		
@@ -3184,78 +3184,78 @@ out expr);
 
 	void Statement() {
 
-#line  1420 "cs.ATG" 
+#line  1423 "cs.ATG" 
 		TypeReference type;
 		Expression expr;
 		Statement stmt = null;
 		Location startPos = la.Location;
 		
 		if (
-#line  1428 "cs.ATG" 
+#line  1431 "cs.ATG" 
 IsLabel()) {
 			Identifier();
 
-#line  1428 "cs.ATG" 
+#line  1431 "cs.ATG" 
 			compilationUnit.AddChild(new LabelStatement(t.val)); 
 			Expect(9);
 			Statement();
 		} else if (la.kind == 60) {
 			lexer.NextToken();
 			Type(
-#line  1431 "cs.ATG" 
+#line  1434 "cs.ATG" 
 out type);
 
-#line  1431 "cs.ATG" 
+#line  1434 "cs.ATG" 
 			LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifiers.Const); string ident = null; var.StartLocation = t.Location; 
 			Identifier();
 
-#line  1432 "cs.ATG" 
+#line  1435 "cs.ATG" 
 			ident = t.val; 
 			Expect(3);
 			Expr(
-#line  1433 "cs.ATG" 
+#line  1436 "cs.ATG" 
 out expr);
 
-#line  1433 "cs.ATG" 
+#line  1436 "cs.ATG" 
 			var.Variables.Add(new VariableDeclaration(ident, expr)); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				Identifier();
 
-#line  1434 "cs.ATG" 
+#line  1437 "cs.ATG" 
 				ident = t.val; 
 				Expect(3);
 				Expr(
-#line  1434 "cs.ATG" 
+#line  1437 "cs.ATG" 
 out expr);
 
-#line  1434 "cs.ATG" 
+#line  1437 "cs.ATG" 
 				var.Variables.Add(new VariableDeclaration(ident, expr)); 
 			}
 			Expect(11);
 
-#line  1435 "cs.ATG" 
+#line  1438 "cs.ATG" 
 			compilationUnit.AddChild(var); 
 		} else if (
-#line  1437 "cs.ATG" 
+#line  1440 "cs.ATG" 
 IsLocalVarDecl()) {
 			LocalVariableDecl(
-#line  1437 "cs.ATG" 
+#line  1440 "cs.ATG" 
 out stmt);
 			Expect(11);
 
-#line  1437 "cs.ATG" 
+#line  1440 "cs.ATG" 
 			compilationUnit.AddChild(stmt); 
 		} else if (StartOf(27)) {
 			EmbeddedStatement(
-#line  1438 "cs.ATG" 
+#line  1441 "cs.ATG" 
 out stmt);
 
-#line  1438 "cs.ATG" 
+#line  1441 "cs.ATG" 
 			compilationUnit.AddChild(stmt); 
 		} else SynErr(189);
 
-#line  1444 "cs.ATG" 
+#line  1447 "cs.ATG" 
 		if (stmt != null) {
 		stmt.StartLocation = startPos;
 		stmt.EndLocation = t.EndLocation;
@@ -3301,6 +3301,9 @@ out Expression outExpr) {
 		CollectionInitializerExpression initializer = new CollectionInitializerExpression();
 		
 		Expect(16);
+
+#line  1355 "cs.ATG" 
+		initializer.StartLocation = t.Location; 
 		if (StartOf(28)) {
 			VariableInitializer(
 #line  1356 "cs.ATG" 
@@ -3326,7 +3329,7 @@ out expr);
 		Expect(17);
 
 #line  1364 "cs.ATG" 
-		outExpr = initializer; 
+		initializer.EndLocation = t.Location; outExpr = initializer; 
 	}
 
 	void AssignmentOperator(
@@ -3405,6 +3408,9 @@ out Expression outExpr) {
 		CollectionInitializerExpression initializer = new CollectionInitializerExpression();
 		
 		Expect(16);
+
+#line  1373 "cs.ATG" 
+		initializer.StartLocation = t.Location; 
 		if (StartOf(28)) {
 			ObjectPropertyInitializerOrVariableInitializer(
 #line  1374 "cs.ATG" 
@@ -3430,7 +3436,7 @@ out expr);
 		Expect(17);
 
 #line  1382 "cs.ATG" 
-		outExpr = initializer; 
+		initializer.EndLocation = t.Location; outExpr = initializer; 
 	}
 
 	void ObjectPropertyInitializerOrVariableInitializer(
@@ -3445,84 +3451,90 @@ IdentAndAsgn()) {
 			Identifier();
 
 #line  1390 "cs.ATG" 
-			IdentifierExpression l = new IdentifierExpression(t.val);
-			l.StartLocation = t.Location; l.EndLocation = t.EndLocation;
+			NamedArgumentExpression nae = new NamedArgumentExpression(t.val, null);
+			nae.StartLocation = t.Location;
 			Expression r = null; 
 			Expect(3);
-			VariableInitializer(
-#line  1393 "cs.ATG" 
+			if (la.kind == 16) {
+				CollectionOrObjectInitializer(
+#line  1394 "cs.ATG" 
+out r);
+			} else if (StartOf(28)) {
+				VariableInitializer(
+#line  1395 "cs.ATG" 
 out r);
+			} else SynErr(191);
 
-#line  1394 "cs.ATG" 
-			expr = new AssignmentExpression(l, AssignmentOperatorType.Assign, r); 
+#line  1396 "cs.ATG" 
+			nae.Expression = r; nae.EndLocation = t.EndLocation; expr = nae; 
 		} else if (StartOf(28)) {
 			VariableInitializer(
-#line  1395 "cs.ATG" 
+#line  1398 "cs.ATG" 
 out expr);
-		} else SynErr(191);
+		} else SynErr(192);
 	}
 
 	void LocalVariableDecl(
-#line  1399 "cs.ATG" 
+#line  1402 "cs.ATG" 
 out Statement stmt) {
 
-#line  1401 "cs.ATG" 
+#line  1404 "cs.ATG" 
 		TypeReference type;
 		VariableDeclaration      var = null;
 		LocalVariableDeclaration localVariableDeclaration; 
 		
 		Type(
-#line  1406 "cs.ATG" 
+#line  1409 "cs.ATG" 
 out type);
 
-#line  1406 "cs.ATG" 
+#line  1409 "cs.ATG" 
 		localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; 
 		LocalVariableDeclarator(
-#line  1407 "cs.ATG" 
+#line  1410 "cs.ATG" 
 out var);
 
-#line  1407 "cs.ATG" 
+#line  1410 "cs.ATG" 
 		localVariableDeclaration.Variables.Add(var); 
 		while (la.kind == 14) {
 			lexer.NextToken();
 			LocalVariableDeclarator(
-#line  1408 "cs.ATG" 
+#line  1411 "cs.ATG" 
 out var);
 
-#line  1408 "cs.ATG" 
+#line  1411 "cs.ATG" 
 			localVariableDeclaration.Variables.Add(var); 
 		}
 
-#line  1409 "cs.ATG" 
+#line  1412 "cs.ATG" 
 		stmt = localVariableDeclaration; 
 	}
 
 	void LocalVariableDeclarator(
-#line  1412 "cs.ATG" 
+#line  1415 "cs.ATG" 
 out VariableDeclaration var) {
 
-#line  1413 "cs.ATG" 
+#line  1416 "cs.ATG" 
 		Expression expr = null; 
 		Identifier();
 
-#line  1415 "cs.ATG" 
+#line  1418 "cs.ATG" 
 		var = new VariableDeclaration(t.val); 
 		if (la.kind == 3) {
 			lexer.NextToken();
 			VariableInitializer(
-#line  1415 "cs.ATG" 
+#line  1418 "cs.ATG" 
 out expr);
 
-#line  1415 "cs.ATG" 
+#line  1418 "cs.ATG" 
 			var.Initializer = expr; 
 		}
 	}
 
 	void EmbeddedStatement(
-#line  1451 "cs.ATG" 
+#line  1454 "cs.ATG" 
 out Statement statement) {
 
-#line  1453 "cs.ATG" 
+#line  1456 "cs.ATG" 
 		TypeReference type = null;
 		Expression expr = null;
 		Statement embeddedStatement = null;
@@ -3530,57 +3542,57 @@ out Statement statement) {
 		
 		if (la.kind == 16) {
 			Block(
-#line  1459 "cs.ATG" 
+#line  1462 "cs.ATG" 
 out statement);
 		} else if (la.kind == 11) {
 			lexer.NextToken();
 
-#line  1461 "cs.ATG" 
+#line  1464 "cs.ATG" 
 			statement = new EmptyStatement(); 
 		} else if (
-#line  1463 "cs.ATG" 
+#line  1466 "cs.ATG" 
 UnCheckedAndLBrace()) {
 
-#line  1463 "cs.ATG" 
+#line  1466 "cs.ATG" 
 			Statement block; bool isChecked = true; 
 			if (la.kind == 58) {
 				lexer.NextToken();
 			} else if (la.kind == 118) {
 				lexer.NextToken();
 
-#line  1464 "cs.ATG" 
+#line  1467 "cs.ATG" 
 				isChecked = false;
-			} else SynErr(192);
+			} else SynErr(193);
 			Block(
-#line  1465 "cs.ATG" 
+#line  1468 "cs.ATG" 
 out block);
 
-#line  1465 "cs.ATG" 
+#line  1468 "cs.ATG" 
 			statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); 
 		} else if (la.kind == 79) {
 			lexer.NextToken();
 
-#line  1467 "cs.ATG" 
+#line  1470 "cs.ATG" 
 			Statement elseStatement = null; 
 			Expect(20);
 			Expr(
-#line  1468 "cs.ATG" 
+#line  1471 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1469 "cs.ATG" 
+#line  1472 "cs.ATG" 
 out embeddedStatement);
 			if (la.kind == 67) {
 				lexer.NextToken();
 				EmbeddedStatement(
-#line  1470 "cs.ATG" 
+#line  1473 "cs.ATG" 
 out elseStatement);
 			}
 
-#line  1471 "cs.ATG" 
+#line  1474 "cs.ATG" 
 			statement = elseStatement != null ? new IfElseStatement(expr, embeddedStatement, elseStatement) : new IfElseStatement(expr, embeddedStatement); 
 
-#line  1472 "cs.ATG" 
+#line  1475 "cs.ATG" 
 			if (elseStatement is IfElseStatement && (elseStatement as IfElseStatement).TrueStatement.Count == 1) {
 			/* else if-section (otherwise we would have a BlockStatment) */
 			(statement as IfElseStatement).ElseIfSections.Add(
@@ -3592,99 +3604,99 @@ out elseStatement);
 		} else if (la.kind == 110) {
 			lexer.NextToken();
 
-#line  1480 "cs.ATG" 
+#line  1483 "cs.ATG" 
 			List<SwitchSection> switchSections = new List<SwitchSection>(); 
 			Expect(20);
 			Expr(
-#line  1481 "cs.ATG" 
+#line  1484 "cs.ATG" 
 out expr);
 			Expect(21);
 			Expect(16);
 			SwitchSections(
-#line  1482 "cs.ATG" 
+#line  1485 "cs.ATG" 
 switchSections);
 			Expect(17);
 
-#line  1483 "cs.ATG" 
+#line  1486 "cs.ATG" 
 			statement = new SwitchStatement(expr, switchSections); 
 		} else if (la.kind == 125) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  1485 "cs.ATG" 
+#line  1488 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1487 "cs.ATG" 
+#line  1490 "cs.ATG" 
 out embeddedStatement);
 
-#line  1487 "cs.ATG" 
+#line  1490 "cs.ATG" 
 			statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start);
 		} else if (la.kind == 65) {
 			lexer.NextToken();
 			EmbeddedStatement(
-#line  1488 "cs.ATG" 
+#line  1491 "cs.ATG" 
 out embeddedStatement);
 			Expect(125);
 			Expect(20);
 			Expr(
-#line  1489 "cs.ATG" 
+#line  1492 "cs.ATG" 
 out expr);
 			Expect(21);
 			Expect(11);
 
-#line  1489 "cs.ATG" 
+#line  1492 "cs.ATG" 
 			statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); 
 		} else if (la.kind == 76) {
 			lexer.NextToken();
 
-#line  1490 "cs.ATG" 
+#line  1493 "cs.ATG" 
 			List<Statement> initializer = null; List<Statement> iterator = null; 
 			Expect(20);
 			if (StartOf(6)) {
 				ForInitializer(
-#line  1491 "cs.ATG" 
+#line  1494 "cs.ATG" 
 out initializer);
 			}
 			Expect(11);
 			if (StartOf(6)) {
 				Expr(
-#line  1492 "cs.ATG" 
+#line  1495 "cs.ATG" 
 out expr);
 			}
 			Expect(11);
 			if (StartOf(6)) {
 				ForIterator(
-#line  1493 "cs.ATG" 
+#line  1496 "cs.ATG" 
 out iterator);
 			}
 			Expect(21);
 			EmbeddedStatement(
-#line  1494 "cs.ATG" 
+#line  1497 "cs.ATG" 
 out embeddedStatement);
 
-#line  1494 "cs.ATG" 
+#line  1497 "cs.ATG" 
 			statement = new ForStatement(initializer, expr, iterator, embeddedStatement); 
 		} else if (la.kind == 77) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  1495 "cs.ATG" 
+#line  1498 "cs.ATG" 
 out type);
 			Identifier();
 
-#line  1495 "cs.ATG" 
+#line  1498 "cs.ATG" 
 			string varName = t.val; Location start = t.Location;
 			Expect(81);
 			Expr(
-#line  1496 "cs.ATG" 
+#line  1499 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1497 "cs.ATG" 
+#line  1500 "cs.ATG" 
 out embeddedStatement);
 
-#line  1497 "cs.ATG" 
+#line  1500 "cs.ATG" 
 			statement = new ForeachStatement(type, varName , expr, embeddedStatement); 
 			statement.EndLocation = t.EndLocation;
 			
@@ -3692,175 +3704,175 @@ out embeddedStatement);
 			lexer.NextToken();
 			Expect(11);
 
-#line  1501 "cs.ATG" 
+#line  1504 "cs.ATG" 
 			statement = new BreakStatement(); 
 		} else if (la.kind == 61) {
 			lexer.NextToken();
 			Expect(11);
 
-#line  1502 "cs.ATG" 
+#line  1505 "cs.ATG" 
 			statement = new ContinueStatement(); 
 		} else if (la.kind == 78) {
 			GotoStatement(
-#line  1503 "cs.ATG" 
+#line  1506 "cs.ATG" 
 out statement);
 		} else if (
-#line  1504 "cs.ATG" 
+#line  1507 "cs.ATG" 
 IsYieldStatement()) {
 			Expect(132);
 			if (la.kind == 101) {
 				lexer.NextToken();
 				Expr(
-#line  1504 "cs.ATG" 
+#line  1507 "cs.ATG" 
 out expr);
 
-#line  1504 "cs.ATG" 
+#line  1507 "cs.ATG" 
 				statement = new YieldStatement(new ReturnStatement(expr)); 
 			} else if (la.kind == 53) {
 				lexer.NextToken();
 
-#line  1505 "cs.ATG" 
+#line  1508 "cs.ATG" 
 				statement = new YieldStatement(new BreakStatement()); 
-			} else SynErr(193);
+			} else SynErr(194);
 			Expect(11);
 		} else if (la.kind == 101) {
 			lexer.NextToken();
 			if (StartOf(6)) {
 				Expr(
-#line  1506 "cs.ATG" 
+#line  1509 "cs.ATG" 
 out expr);
 			}
 			Expect(11);
 
-#line  1506 "cs.ATG" 
+#line  1509 "cs.ATG" 
 			statement = new ReturnStatement(expr); 
 		} else if (la.kind == 112) {
 			lexer.NextToken();
 			if (StartOf(6)) {
 				Expr(
-#line  1507 "cs.ATG" 
+#line  1510 "cs.ATG" 
 out expr);
 			}
 			Expect(11);
 
-#line  1507 "cs.ATG" 
+#line  1510 "cs.ATG" 
 			statement = new ThrowStatement(expr); 
 		} else if (StartOf(6)) {
 			StatementExpr(
-#line  1510 "cs.ATG" 
+#line  1513 "cs.ATG" 
 out statement);
 			Expect(11);
 		} else if (la.kind == 114) {
 			TryStatement(
-#line  1512 "cs.ATG" 
+#line  1515 "cs.ATG" 
 out statement);
 		} else if (la.kind == 86) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  1514 "cs.ATG" 
+#line  1517 "cs.ATG" 
 out expr);
 			Expect(21);
 			EmbeddedStatement(
-#line  1515 "cs.ATG" 
+#line  1518 "cs.ATG" 
 out embeddedStatement);
 
-#line  1515 "cs.ATG" 
+#line  1518 "cs.ATG" 
 			statement = new LockStatement(expr, embeddedStatement); 
 		} else if (la.kind == 121) {
 
-#line  1517 "cs.ATG" 
+#line  1520 "cs.ATG" 
 			Statement resourceAcquisitionStmt = null; 
 			lexer.NextToken();
 			Expect(20);
 			ResourceAcquisition(
-#line  1519 "cs.ATG" 
+#line  1522 "cs.ATG" 
 out resourceAcquisitionStmt);
 			Expect(21);
 			EmbeddedStatement(
-#line  1520 "cs.ATG" 
+#line  1523 "cs.ATG" 
 out embeddedStatement);
 
-#line  1520 "cs.ATG" 
+#line  1523 "cs.ATG" 
 			statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); 
 		} else if (la.kind == 119) {
 			lexer.NextToken();
 			Block(
-#line  1522 "cs.ATG" 
+#line  1525 "cs.ATG" 
 out embeddedStatement);
 
-#line  1522 "cs.ATG" 
+#line  1525 "cs.ATG" 
 			statement = new UnsafeStatement(embeddedStatement); 
 		} else if (la.kind == 74) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  1525 "cs.ATG" 
+#line  1528 "cs.ATG" 
 out type);
 
-#line  1525 "cs.ATG" 
+#line  1528 "cs.ATG" 
 			if (type.PointerNestingLevel == 0) Error("can only fix pointer types");
 			List<VariableDeclaration> pointerDeclarators = new List<VariableDeclaration>(1);
 			
 			Identifier();
 
-#line  1528 "cs.ATG" 
+#line  1531 "cs.ATG" 
 			string identifier = t.val; 
 			Expect(3);
 			Expr(
-#line  1529 "cs.ATG" 
+#line  1532 "cs.ATG" 
 out expr);
 
-#line  1529 "cs.ATG" 
+#line  1532 "cs.ATG" 
 			pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				Identifier();
 
-#line  1531 "cs.ATG" 
+#line  1534 "cs.ATG" 
 				identifier = t.val; 
 				Expect(3);
 				Expr(
-#line  1532 "cs.ATG" 
+#line  1535 "cs.ATG" 
 out expr);
 
-#line  1532 "cs.ATG" 
+#line  1535 "cs.ATG" 
 				pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); 
 			}
 			Expect(21);
 			EmbeddedStatement(
-#line  1534 "cs.ATG" 
+#line  1537 "cs.ATG" 
 out embeddedStatement);
 
-#line  1534 "cs.ATG" 
+#line  1537 "cs.ATG" 
 			statement = new FixedStatement(type, pointerDeclarators, embeddedStatement); 
-		} else SynErr(194);
+		} else SynErr(195);
 	}
 
 	void SwitchSections(
-#line  1556 "cs.ATG" 
+#line  1559 "cs.ATG" 
 List<SwitchSection> switchSections) {
 
-#line  1558 "cs.ATG" 
+#line  1561 "cs.ATG" 
 		SwitchSection switchSection = new SwitchSection();
 		CaseLabel label;
 		
 		SwitchLabel(
-#line  1562 "cs.ATG" 
+#line  1565 "cs.ATG" 
 out label);
 
-#line  1562 "cs.ATG" 
+#line  1565 "cs.ATG" 
 		if (label != null) { switchSection.SwitchLabels.Add(label); } 
 
-#line  1563 "cs.ATG" 
+#line  1566 "cs.ATG" 
 		compilationUnit.BlockStart(switchSection); 
 		while (StartOf(29)) {
 			if (la.kind == 55 || la.kind == 63) {
 				SwitchLabel(
-#line  1565 "cs.ATG" 
+#line  1568 "cs.ATG" 
 out label);
 
-#line  1566 "cs.ATG" 
+#line  1569 "cs.ATG" 
 				if (label != null) {
 				if (switchSection.Children.Count > 0) {
 					// open new section
@@ -3876,347 +3888,347 @@ out label);
 			}
 		}
 
-#line  1578 "cs.ATG" 
+#line  1581 "cs.ATG" 
 		compilationUnit.BlockEnd(); switchSections.Add(switchSection); 
 	}
 
 	void ForInitializer(
-#line  1537 "cs.ATG" 
+#line  1540 "cs.ATG" 
 out List<Statement> initializer) {
 
-#line  1539 "cs.ATG" 
+#line  1542 "cs.ATG" 
 		Statement stmt; 
 		initializer = new List<Statement>();
 		
 		if (
-#line  1543 "cs.ATG" 
+#line  1546 "cs.ATG" 
 IsLocalVarDecl()) {
 			LocalVariableDecl(
-#line  1543 "cs.ATG" 
+#line  1546 "cs.ATG" 
 out stmt);
 
-#line  1543 "cs.ATG" 
+#line  1546 "cs.ATG" 
 			initializer.Add(stmt);
 		} else if (StartOf(6)) {
 			StatementExpr(
-#line  1544 "cs.ATG" 
+#line  1547 "cs.ATG" 
 out stmt);
 
-#line  1544 "cs.ATG" 
+#line  1547 "cs.ATG" 
 			initializer.Add(stmt);
 			while (la.kind == 14) {
 				lexer.NextToken();
 				StatementExpr(
-#line  1544 "cs.ATG" 
+#line  1547 "cs.ATG" 
 out stmt);
 
-#line  1544 "cs.ATG" 
+#line  1547 "cs.ATG" 
 				initializer.Add(stmt);
 			}
-		} else SynErr(195);
+		} else SynErr(196);
 	}
 
 	void ForIterator(
-#line  1547 "cs.ATG" 
+#line  1550 "cs.ATG" 
 out List<Statement> iterator) {
 
-#line  1549 "cs.ATG" 
+#line  1552 "cs.ATG" 
 		Statement stmt; 
 		iterator = new List<Statement>();
 		
 		StatementExpr(
-#line  1553 "cs.ATG" 
+#line  1556 "cs.ATG" 
 out stmt);
 
-#line  1553 "cs.ATG" 
+#line  1556 "cs.ATG" 
 		iterator.Add(stmt);
 		while (la.kind == 14) {
 			lexer.NextToken();
 			StatementExpr(
-#line  1553 "cs.ATG" 
+#line  1556 "cs.ATG" 
 out stmt);
 
-#line  1553 "cs.ATG" 
+#line  1556 "cs.ATG" 
 			iterator.Add(stmt); 
 		}
 	}
 
 	void GotoStatement(
-#line  1631 "cs.ATG" 
+#line  1634 "cs.ATG" 
 out Statement stmt) {
 
-#line  1632 "cs.ATG" 
+#line  1635 "cs.ATG" 
 		Expression expr; stmt = null; 
 		Expect(78);
 		if (StartOf(17)) {
 			Identifier();
 
-#line  1636 "cs.ATG" 
+#line  1639 "cs.ATG" 
 			stmt = new GotoStatement(t.val); 
 			Expect(11);
 		} else if (la.kind == 55) {
 			lexer.NextToken();
 			Expr(
-#line  1637 "cs.ATG" 
+#line  1640 "cs.ATG" 
 out expr);
 			Expect(11);
 
-#line  1637 "cs.ATG" 
+#line  1640 "cs.ATG" 
 			stmt = new GotoCaseStatement(expr); 
 		} else if (la.kind == 63) {
 			lexer.NextToken();
 			Expect(11);
 
-#line  1638 "cs.ATG" 
+#line  1641 "cs.ATG" 
 			stmt = new GotoCaseStatement(null); 
-		} else SynErr(196);
+		} else SynErr(197);
 	}
 
 	void StatementExpr(
-#line  1658 "cs.ATG" 
+#line  1661 "cs.ATG" 
 out Statement stmt) {
 
-#line  1659 "cs.ATG" 
+#line  1662 "cs.ATG" 
 		Expression expr; 
 		Expr(
-#line  1661 "cs.ATG" 
+#line  1664 "cs.ATG" 
 out expr);
 
-#line  1664 "cs.ATG" 
+#line  1667 "cs.ATG" 
 		stmt = new ExpressionStatement(expr); 
 	}
 
 	void TryStatement(
-#line  1588 "cs.ATG" 
+#line  1591 "cs.ATG" 
 out Statement tryStatement) {
 
-#line  1590 "cs.ATG" 
+#line  1593 "cs.ATG" 
 		Statement blockStmt = null, finallyStmt = null;
 		List<CatchClause> catchClauses = null;
 		
 		Expect(114);
 		Block(
-#line  1594 "cs.ATG" 
+#line  1597 "cs.ATG" 
 out blockStmt);
 		if (la.kind == 56) {
 			CatchClauses(
-#line  1596 "cs.ATG" 
+#line  1599 "cs.ATG" 
 out catchClauses);
 			if (la.kind == 73) {
 				lexer.NextToken();
 				Block(
-#line  1596 "cs.ATG" 
+#line  1599 "cs.ATG" 
 out finallyStmt);
 			}
 		} else if (la.kind == 73) {
 			lexer.NextToken();
 			Block(
-#line  1597 "cs.ATG" 
+#line  1600 "cs.ATG" 
 out finallyStmt);
-		} else SynErr(197);
+		} else SynErr(198);
 
-#line  1600 "cs.ATG" 
+#line  1603 "cs.ATG" 
 		tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt);
 			
 	}
 
 	void ResourceAcquisition(
-#line  1642 "cs.ATG" 
+#line  1645 "cs.ATG" 
 out Statement stmt) {
 
-#line  1644 "cs.ATG" 
+#line  1647 "cs.ATG" 
 		stmt = null;
 		Expression expr;
 		
 		if (
-#line  1649 "cs.ATG" 
+#line  1652 "cs.ATG" 
 IsLocalVarDecl()) {
 			LocalVariableDecl(
-#line  1649 "cs.ATG" 
+#line  1652 "cs.ATG" 
 out stmt);
 		} else if (StartOf(6)) {
 			Expr(
-#line  1650 "cs.ATG" 
+#line  1653 "cs.ATG" 
 out expr);
 
-#line  1654 "cs.ATG" 
+#line  1657 "cs.ATG" 
 			stmt = new ExpressionStatement(expr); 
-		} else SynErr(198);
+		} else SynErr(199);
 	}
 
 	void SwitchLabel(
-#line  1581 "cs.ATG" 
+#line  1584 "cs.ATG" 
 out CaseLabel label) {
 
-#line  1582 "cs.ATG" 
+#line  1585 "cs.ATG" 
 		Expression expr = null; label = null; 
 		if (la.kind == 55) {
 			lexer.NextToken();
 			Expr(
-#line  1584 "cs.ATG" 
+#line  1587 "cs.ATG" 
 out expr);
 			Expect(9);
 
-#line  1584 "cs.ATG" 
+#line  1587 "cs.ATG" 
 			label =  new CaseLabel(expr); 
 		} else if (la.kind == 63) {
 			lexer.NextToken();
 			Expect(9);
 
-#line  1585 "cs.ATG" 
+#line  1588 "cs.ATG" 
 			label =  new CaseLabel(); 
-		} else SynErr(199);
+		} else SynErr(200);
 	}
 
 	void CatchClauses(
-#line  1605 "cs.ATG" 
+#line  1608 "cs.ATG" 
 out List<CatchClause> catchClauses) {
 
-#line  1607 "cs.ATG" 
+#line  1610 "cs.ATG" 
 		catchClauses = new List<CatchClause>();
 		
 		Expect(56);
 
-#line  1610 "cs.ATG" 
+#line  1613 "cs.ATG" 
 		string identifier;
 		Statement stmt;
 		TypeReference typeRef;
 		
 		if (la.kind == 16) {
 			Block(
-#line  1616 "cs.ATG" 
+#line  1619 "cs.ATG" 
 out stmt);
 
-#line  1616 "cs.ATG" 
+#line  1619 "cs.ATG" 
 			catchClauses.Add(new CatchClause(stmt)); 
 		} else if (la.kind == 20) {
 			lexer.NextToken();
 			ClassType(
-#line  1618 "cs.ATG" 
+#line  1621 "cs.ATG" 
 out typeRef, false);
 
-#line  1618 "cs.ATG" 
+#line  1621 "cs.ATG" 
 			identifier = null; 
 			if (StartOf(17)) {
 				Identifier();
 
-#line  1619 "cs.ATG" 
+#line  1622 "cs.ATG" 
 				identifier = t.val; 
 			}
 			Expect(21);
 			Block(
-#line  1620 "cs.ATG" 
+#line  1623 "cs.ATG" 
 out stmt);
 
-#line  1621 "cs.ATG" 
+#line  1624 "cs.ATG" 
 			catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); 
 			while (
-#line  1622 "cs.ATG" 
+#line  1625 "cs.ATG" 
 IsTypedCatch()) {
 				Expect(56);
 				Expect(20);
 				ClassType(
-#line  1622 "cs.ATG" 
+#line  1625 "cs.ATG" 
 out typeRef, false);
 
-#line  1622 "cs.ATG" 
+#line  1625 "cs.ATG" 
 				identifier = null; 
 				if (StartOf(17)) {
 					Identifier();
 
-#line  1623 "cs.ATG" 
+#line  1626 "cs.ATG" 
 					identifier = t.val; 
 				}
 				Expect(21);
 				Block(
-#line  1624 "cs.ATG" 
+#line  1627 "cs.ATG" 
 out stmt);
 
-#line  1625 "cs.ATG" 
+#line  1628 "cs.ATG" 
 				catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); 
 			}
 			if (la.kind == 56) {
 				lexer.NextToken();
 				Block(
-#line  1627 "cs.ATG" 
+#line  1630 "cs.ATG" 
 out stmt);
 
-#line  1627 "cs.ATG" 
+#line  1630 "cs.ATG" 
 				catchClauses.Add(new CatchClause(stmt)); 
 			}
-		} else SynErr(200);
+		} else SynErr(201);
 	}
 
 	void UnaryExpr(
-#line  1685 "cs.ATG" 
+#line  1688 "cs.ATG" 
 out Expression uExpr) {
 
-#line  1687 "cs.ATG" 
+#line  1690 "cs.ATG" 
 		TypeReference type = null;
 		Expression expr = null;
 		ArrayList expressions = new ArrayList();
 		uExpr = null;
 		
 		while (StartOf(30) || 
-#line  1709 "cs.ATG" 
+#line  1712 "cs.ATG" 
 IsTypeCast()) {
 			if (la.kind == 4) {
 				lexer.NextToken();
 
-#line  1696 "cs.ATG" 
+#line  1699 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); 
 			} else if (la.kind == 5) {
 				lexer.NextToken();
 
-#line  1697 "cs.ATG" 
+#line  1700 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); 
 			} else if (la.kind == 24) {
 				lexer.NextToken();
 
-#line  1698 "cs.ATG" 
+#line  1701 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); 
 			} else if (la.kind == 27) {
 				lexer.NextToken();
 
-#line  1699 "cs.ATG" 
+#line  1702 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); 
 			} else if (la.kind == 6) {
 				lexer.NextToken();
 
-#line  1700 "cs.ATG" 
+#line  1703 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Star)); 
 			} else if (la.kind == 31) {
 				lexer.NextToken();
 
-#line  1701 "cs.ATG" 
+#line  1704 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); 
 			} else if (la.kind == 32) {
 				lexer.NextToken();
 
-#line  1702 "cs.ATG" 
+#line  1705 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); 
 			} else if (la.kind == 28) {
 				lexer.NextToken();
 
-#line  1703 "cs.ATG" 
+#line  1706 "cs.ATG" 
 				expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitWiseAnd)); 
 			} else {
 				Expect(20);
 				Type(
-#line  1709 "cs.ATG" 
+#line  1712 "cs.ATG" 
 out type);
 				Expect(21);
 
-#line  1709 "cs.ATG" 
+#line  1712 "cs.ATG" 
 				expressions.Add(new CastExpression(type)); 
 			}
 		}
 		if (
-#line  1714 "cs.ATG" 
+#line  1717 "cs.ATG" 
 LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffix()) {
 			Expect(2);
 
-#line  1717 "cs.ATG" 
+#line  1720 "cs.ATG" 
 			expressions.RemoveAt(expressions.Count - 1);
 			if (t.literalValue is uint) {
 				expr = new PrimitiveExpression(int.MinValue, int.MinValue.ToString());
@@ -4228,11 +4240,11 @@ LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffi
 			
 		} else if (StartOf(31)) {
 			PrimaryExpr(
-#line  1726 "cs.ATG" 
+#line  1729 "cs.ATG" 
 out expr);
-		} else SynErr(201);
+		} else SynErr(202);
 
-#line  1728 "cs.ATG" 
+#line  1731 "cs.ATG" 
 		for (int i = 0; i < expressions.Count; ++i) {
 		Expression nextExpression = i + 1 < expressions.Count ? (Expression)expressions[i + 1] : expr;
 		if (expressions[i] is CastExpression) {
@@ -4250,33 +4262,33 @@ out expr);
 	}
 
 	void ConditionalOrExpr(
-#line  2000 "cs.ATG" 
+#line  2003 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2001 "cs.ATG" 
+#line  2004 "cs.ATG" 
 		Expression expr;   
 		ConditionalAndExpr(
-#line  2003 "cs.ATG" 
+#line  2006 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 26) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2003 "cs.ATG" 
+#line  2006 "cs.ATG" 
 out expr);
 			ConditionalAndExpr(
-#line  2003 "cs.ATG" 
+#line  2006 "cs.ATG" 
 ref expr);
 
-#line  2003 "cs.ATG" 
+#line  2006 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr);  
 		}
 	}
 
 	void PrimaryExpr(
-#line  1745 "cs.ATG" 
+#line  1748 "cs.ATG" 
 out Expression pexpr) {
 
-#line  1747 "cs.ATG" 
+#line  1750 "cs.ATG" 
 		TypeReference type = null;
 		List<TypeReference> typeList = null;
 		Expression expr;
@@ -4285,479 +4297,479 @@ out Expression pexpr) {
 		if (la.kind == 113) {
 			lexer.NextToken();
 
-#line  1754 "cs.ATG" 
+#line  1757 "cs.ATG" 
 			pexpr = new PrimitiveExpression(true, "true");  
 		} else if (la.kind == 72) {
 			lexer.NextToken();
 
-#line  1755 "cs.ATG" 
+#line  1758 "cs.ATG" 
 			pexpr = new PrimitiveExpression(false, "false"); 
 		} else if (la.kind == 90) {
 			lexer.NextToken();
 
-#line  1756 "cs.ATG" 
+#line  1759 "cs.ATG" 
 			pexpr = new PrimitiveExpression(null, "null");  
 		} else if (la.kind == 2) {
 			lexer.NextToken();
 
-#line  1757 "cs.ATG" 
+#line  1760 "cs.ATG" 
 			pexpr = new PrimitiveExpression(t.literalValue, t.val);  
 		} else if (
-#line  1758 "cs.ATG" 
+#line  1761 "cs.ATG" 
 StartOfQueryExpression()) {
 			QueryExpression(
-#line  1759 "cs.ATG" 
+#line  1762 "cs.ATG" 
 out pexpr);
 		} else if (
-#line  1760 "cs.ATG" 
+#line  1763 "cs.ATG" 
 IdentAndDoubleColon()) {
 			Identifier();
 
-#line  1761 "cs.ATG" 
+#line  1764 "cs.ATG" 
 			type = new TypeReference(t.val); 
 			Expect(10);
 
-#line  1762 "cs.ATG" 
+#line  1765 "cs.ATG" 
 			pexpr = new TypeReferenceExpression(type); 
 			Identifier();
 
-#line  1763 "cs.ATG" 
+#line  1766 "cs.ATG" 
 			if (type.Type == "global") { type.IsGlobal = true; type.Type = (t.val ?? "?"); } else type.Type += "." + (t.val ?? "?"); 
 		} else if (StartOf(17)) {
 			Identifier();
 
-#line  1766 "cs.ATG" 
+#line  1769 "cs.ATG" 
 			pexpr = new IdentifierExpression(t.val); 
 
-#line  1767 "cs.ATG" 
+#line  1770 "cs.ATG" 
 			pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; 
 			if (la.kind == 48) {
 				ShortedLambdaExpression(
-#line  1769 "cs.ATG" 
+#line  1772 "cs.ATG" 
 (IdentifierExpression)pexpr, out pexpr);
 			}
 		} else if (
-#line  1770 "cs.ATG" 
+#line  1773 "cs.ATG" 
 IsLambdaExpression()) {
 			LambdaExpression(
-#line  1771 "cs.ATG" 
+#line  1774 "cs.ATG" 
 out pexpr);
 		} else if (la.kind == 20) {
 			lexer.NextToken();
 			Expr(
-#line  1773 "cs.ATG" 
+#line  1776 "cs.ATG" 
 out expr);
 			Expect(21);
 
-#line  1773 "cs.ATG" 
+#line  1776 "cs.ATG" 
 			pexpr = new ParenthesizedExpression(expr); 
 		} else if (StartOf(32)) {
 
-#line  1775 "cs.ATG" 
+#line  1778 "cs.ATG" 
 			string val = null; 
 			switch (la.kind) {
 			case 52: {
 				lexer.NextToken();
 
-#line  1777 "cs.ATG" 
+#line  1780 "cs.ATG" 
 				val = "bool"; 
 				break;
 			}
 			case 54: {
 				lexer.NextToken();
 
-#line  1778 "cs.ATG" 
+#line  1781 "cs.ATG" 
 				val = "byte"; 
 				break;
 			}
 			case 57: {
 				lexer.NextToken();
 
-#line  1779 "cs.ATG" 
+#line  1782 "cs.ATG" 
 				val = "char"; 
 				break;
 			}
 			case 62: {
 				lexer.NextToken();
 
-#line  1780 "cs.ATG" 
+#line  1783 "cs.ATG" 
 				val = "decimal"; 
 				break;
 			}
 			case 66: {
 				lexer.NextToken();
 
-#line  1781 "cs.ATG" 
+#line  1784 "cs.ATG" 
 				val = "double"; 
 				break;
 			}
 			case 75: {
 				lexer.NextToken();
 
-#line  1782 "cs.ATG" 
+#line  1785 "cs.ATG" 
 				val = "float"; 
 				break;
 			}
 			case 82: {
 				lexer.NextToken();
 
-#line  1783 "cs.ATG" 
+#line  1786 "cs.ATG" 
 				val = "int"; 
 				break;
 			}
 			case 87: {
 				lexer.NextToken();
 
-#line  1784 "cs.ATG" 
+#line  1787 "cs.ATG" 
 				val = "long"; 
 				break;
 			}
 			case 91: {
 				lexer.NextToken();
 
-#line  1785 "cs.ATG" 
+#line  1788 "cs.ATG" 
 				val = "object"; 
 				break;
 			}
 			case 102: {
 				lexer.NextToken();
 
-#line  1786 "cs.ATG" 
+#line  1789 "cs.ATG" 
 				val = "sbyte"; 
 				break;
 			}
 			case 104: {
 				lexer.NextToken();
 
-#line  1787 "cs.ATG" 
+#line  1790 "cs.ATG" 
 				val = "short"; 
 				break;
 			}
 			case 108: {
 				lexer.NextToken();
 
-#line  1788 "cs.ATG" 
+#line  1791 "cs.ATG" 
 				val = "string"; 
 				break;
 			}
 			case 116: {
 				lexer.NextToken();
 
-#line  1789 "cs.ATG" 
+#line  1792 "cs.ATG" 
 				val = "uint"; 
 				break;
 			}
 			case 117: {
 				lexer.NextToken();
 
-#line  1790 "cs.ATG" 
+#line  1793 "cs.ATG" 
 				val = "ulong"; 
 				break;
 			}
 			case 120: {
 				lexer.NextToken();
 
-#line  1791 "cs.ATG" 
+#line  1794 "cs.ATG" 
 				val = "ushort"; 
 				break;
 			}
 			}
 
-#line  1792 "cs.ATG" 
+#line  1795 "cs.ATG" 
 			t.val = ""; 
 			Expect(15);
 			Identifier();
 
-#line  1792 "cs.ATG" 
+#line  1795 "cs.ATG" 
 			pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); 
 		} else if (la.kind == 111) {
 			lexer.NextToken();
 
-#line  1794 "cs.ATG" 
+#line  1797 "cs.ATG" 
 			pexpr = new ThisReferenceExpression(); 
 		} else if (la.kind == 51) {
 			lexer.NextToken();
 
-#line  1796 "cs.ATG" 
+#line  1799 "cs.ATG" 
 			Expression retExpr = new BaseReferenceExpression(); 
 			if (la.kind == 15) {
 				lexer.NextToken();
 				Identifier();
 
-#line  1798 "cs.ATG" 
+#line  1801 "cs.ATG" 
 				retExpr = new FieldReferenceExpression(retExpr, t.val); 
 			} else if (la.kind == 18) {
 				lexer.NextToken();
 				Expr(
-#line  1799 "cs.ATG" 
+#line  1802 "cs.ATG" 
 out expr);
 
-#line  1799 "cs.ATG" 
+#line  1802 "cs.ATG" 
 				List<Expression> indices = new List<Expression>(); if (expr != null) { indices.Add(expr); } 
 				while (la.kind == 14) {
 					lexer.NextToken();
 					Expr(
-#line  1800 "cs.ATG" 
+#line  1803 "cs.ATG" 
 out expr);
 
-#line  1800 "cs.ATG" 
+#line  1803 "cs.ATG" 
 					if (expr != null) { indices.Add(expr); } 
 				}
 				Expect(19);
 
-#line  1801 "cs.ATG" 
+#line  1804 "cs.ATG" 
 				retExpr = new IndexerExpression(retExpr, indices); 
-			} else SynErr(202);
+			} else SynErr(203);
 
-#line  1802 "cs.ATG" 
+#line  1805 "cs.ATG" 
 			pexpr = retExpr; 
 		} else if (la.kind == 89) {
 			NewExpression(
-#line  1805 "cs.ATG" 
+#line  1808 "cs.ATG" 
 out expr);
 
-#line  1805 "cs.ATG" 
+#line  1808 "cs.ATG" 
 			pexpr = expr; 
 		} else if (la.kind == 115) {
 			lexer.NextToken();
 			Expect(20);
 			if (
-#line  1809 "cs.ATG" 
+#line  1812 "cs.ATG" 
 NotVoidPointer()) {
 				Expect(123);
 
-#line  1809 "cs.ATG" 
+#line  1812 "cs.ATG" 
 				type = new TypeReference("void"); 
 			} else if (StartOf(10)) {
 				TypeWithRestriction(
-#line  1810 "cs.ATG" 
+#line  1813 "cs.ATG" 
 out type, true, true);
-			} else SynErr(203);
+			} else SynErr(204);
 			Expect(21);
 
-#line  1811 "cs.ATG" 
+#line  1814 "cs.ATG" 
 			pexpr = new TypeOfExpression(type); 
 		} else if (la.kind == 63) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  1813 "cs.ATG" 
+#line  1816 "cs.ATG" 
 out type);
 			Expect(21);
 
-#line  1813 "cs.ATG" 
+#line  1816 "cs.ATG" 
 			pexpr = new DefaultValueExpression(type); 
 		} else if (la.kind == 105) {
 			lexer.NextToken();
 			Expect(20);
 			Type(
-#line  1814 "cs.ATG" 
+#line  1817 "cs.ATG" 
 out type);
 			Expect(21);
 
-#line  1814 "cs.ATG" 
+#line  1817 "cs.ATG" 
 			pexpr = new SizeOfExpression(type); 
 		} else if (la.kind == 58) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  1815 "cs.ATG" 
+#line  1818 "cs.ATG" 
 out expr);
 			Expect(21);
 
-#line  1815 "cs.ATG" 
+#line  1818 "cs.ATG" 
 			pexpr = new CheckedExpression(expr); 
 		} else if (la.kind == 118) {
 			lexer.NextToken();
 			Expect(20);
 			Expr(
-#line  1816 "cs.ATG" 
+#line  1819 "cs.ATG" 
 out expr);
 			Expect(21);
 
-#line  1816 "cs.ATG" 
+#line  1819 "cs.ATG" 
 			pexpr = new UncheckedExpression(expr); 
 		} else if (la.kind == 64) {
 			lexer.NextToken();
 			AnonymousMethodExpr(
-#line  1817 "cs.ATG" 
+#line  1820 "cs.ATG" 
 out expr);
 
-#line  1817 "cs.ATG" 
+#line  1820 "cs.ATG" 
 			pexpr = expr; 
-		} else SynErr(204);
+		} else SynErr(205);
 		while (StartOf(33) || 
-#line  1828 "cs.ATG" 
+#line  1831 "cs.ATG" 
 IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || 
-#line  1837 "cs.ATG" 
+#line  1840 "cs.ATG" 
 IsGenericFollowedBy(Tokens.OpenParenthesis)) {
 			if (la.kind == 31 || la.kind == 32) {
 				if (la.kind == 31) {
 					lexer.NextToken();
 
-#line  1821 "cs.ATG" 
+#line  1824 "cs.ATG" 
 					pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); 
 				} else if (la.kind == 32) {
 					lexer.NextToken();
 
-#line  1822 "cs.ATG" 
+#line  1825 "cs.ATG" 
 					pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); 
-				} else SynErr(205);
+				} else SynErr(206);
 			} else if (la.kind == 47) {
 				lexer.NextToken();
 				Identifier();
 
-#line  1825 "cs.ATG" 
+#line  1828 "cs.ATG" 
 				pexpr = new PointerReferenceExpression(pexpr, t.val); 
 			} else if (la.kind == 15) {
 				lexer.NextToken();
 				Identifier();
 
-#line  1826 "cs.ATG" 
+#line  1829 "cs.ATG" 
 				pexpr = new FieldReferenceExpression(pexpr, t.val);
 			} else if (
-#line  1828 "cs.ATG" 
+#line  1831 "cs.ATG" 
 IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) {
 				TypeArgumentList(
-#line  1829 "cs.ATG" 
+#line  1832 "cs.ATG" 
 out typeList, false);
 				Expect(15);
 				Identifier();
 
-#line  1831 "cs.ATG" 
+#line  1834 "cs.ATG" 
 				pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeList), t.val);
 			} else if (la.kind == 20) {
 				lexer.NextToken();
 
-#line  1833 "cs.ATG" 
+#line  1836 "cs.ATG" 
 				List<Expression> parameters = new List<Expression>(); 
 				if (StartOf(24)) {
 					Argument(
-#line  1834 "cs.ATG" 
+#line  1837 "cs.ATG" 
 out expr);
 
-#line  1834 "cs.ATG" 
+#line  1837 "cs.ATG" 
 					if (expr != null) {parameters.Add(expr);} 
 					while (la.kind == 14) {
 						lexer.NextToken();
 						Argument(
-#line  1835 "cs.ATG" 
+#line  1838 "cs.ATG" 
 out expr);
 
-#line  1835 "cs.ATG" 
+#line  1838 "cs.ATG" 
 						if (expr != null) {parameters.Add(expr);} 
 					}
 				}
 				Expect(21);
 
-#line  1836 "cs.ATG" 
+#line  1839 "cs.ATG" 
 				pexpr = new InvocationExpression(pexpr, parameters); 
 			} else if (
-#line  1837 "cs.ATG" 
+#line  1840 "cs.ATG" 
 IsGenericFollowedBy(Tokens.OpenParenthesis)) {
 				TypeArgumentList(
-#line  1837 "cs.ATG" 
+#line  1840 "cs.ATG" 
 out typeList, false);
 				Expect(20);
 
-#line  1838 "cs.ATG" 
+#line  1841 "cs.ATG" 
 				List<Expression> parameters = new List<Expression>(); 
 				if (StartOf(24)) {
 					Argument(
-#line  1839 "cs.ATG" 
+#line  1842 "cs.ATG" 
 out expr);
 
-#line  1839 "cs.ATG" 
+#line  1842 "cs.ATG" 
 					if (expr != null) {parameters.Add(expr);} 
 					while (la.kind == 14) {
 						lexer.NextToken();
 						Argument(
-#line  1840 "cs.ATG" 
+#line  1843 "cs.ATG" 
 out expr);
 
-#line  1840 "cs.ATG" 
+#line  1843 "cs.ATG" 
 						if (expr != null) {parameters.Add(expr);} 
 					}
 				}
 				Expect(21);
 
-#line  1841 "cs.ATG" 
+#line  1844 "cs.ATG" 
 				pexpr = new InvocationExpression(pexpr, parameters, typeList); 
 			} else {
 
-#line  1844 "cs.ATG" 
+#line  1847 "cs.ATG" 
 				List<Expression> indices = new List<Expression>();
 				
 				lexer.NextToken();
 				Expr(
-#line  1846 "cs.ATG" 
+#line  1849 "cs.ATG" 
 out expr);
 
-#line  1846 "cs.ATG" 
+#line  1849 "cs.ATG" 
 				if (expr != null) { indices.Add(expr); } 
 				while (la.kind == 14) {
 					lexer.NextToken();
 					Expr(
-#line  1847 "cs.ATG" 
+#line  1850 "cs.ATG" 
 out expr);
 
-#line  1847 "cs.ATG" 
+#line  1850 "cs.ATG" 
 					if (expr != null) { indices.Add(expr); } 
 				}
 				Expect(19);
 
-#line  1848 "cs.ATG" 
+#line  1851 "cs.ATG" 
 				pexpr = new IndexerExpression(pexpr, indices); 
 			}
 		}
 	}
 
 	void QueryExpression(
-#line  2236 "cs.ATG" 
+#line  2239 "cs.ATG" 
 out Expression outExpr) {
 
-#line  2237 "cs.ATG" 
+#line  2240 "cs.ATG" 
 		QueryExpression q = new QueryExpression(); outExpr = q; q.StartLocation = la.Location; 
 		QueryExpressionFromClause fromClause;
 		
 		QueryExpressionFromClause(
-#line  2241 "cs.ATG" 
+#line  2244 "cs.ATG" 
 out fromClause);
 
-#line  2241 "cs.ATG" 
+#line  2244 "cs.ATG" 
 		q.FromClause = fromClause; 
 		QueryExpressionBody(
-#line  2242 "cs.ATG" 
+#line  2245 "cs.ATG" 
 q);
 
-#line  2243 "cs.ATG" 
+#line  2246 "cs.ATG" 
 		q.EndLocation = t.EndLocation; 
 	}
 
 	void ShortedLambdaExpression(
-#line  1925 "cs.ATG" 
+#line  1928 "cs.ATG" 
 IdentifierExpression ident, out Expression pexpr) {
 
-#line  1926 "cs.ATG" 
+#line  1929 "cs.ATG" 
 		LambdaExpression lambda = new LambdaExpression(); pexpr = lambda; 
 		Expect(48);
 
-#line  1931 "cs.ATG" 
+#line  1934 "cs.ATG" 
 		lambda.StartLocation = ident.StartLocation;
 		lambda.Parameters.Add(new ParameterDeclarationExpression(null, ident.Identifier));
 		lambda.Parameters[0].StartLocation = ident.StartLocation;
 		lambda.Parameters[0].EndLocation = ident.EndLocation;
 		
 		LambdaExpressionBody(
-#line  1936 "cs.ATG" 
+#line  1939 "cs.ATG" 
 lambda);
 	}
 
 	void LambdaExpression(
-#line  1905 "cs.ATG" 
+#line  1908 "cs.ATG" 
 out Expression outExpr) {
 
-#line  1907 "cs.ATG" 
+#line  1910 "cs.ATG" 
 		LambdaExpression lambda = new LambdaExpression();
 		lambda.StartLocation = la.Location;
 		ParameterDeclarationExpression p;
@@ -4766,33 +4778,33 @@ out Expression outExpr) {
 		Expect(20);
 		if (StartOf(10)) {
 			LambdaExpressionParameter(
-#line  1915 "cs.ATG" 
+#line  1918 "cs.ATG" 
 out p);
 
-#line  1915 "cs.ATG" 
+#line  1918 "cs.ATG" 
 			if (p != null) lambda.Parameters.Add(p); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				LambdaExpressionParameter(
-#line  1917 "cs.ATG" 
+#line  1920 "cs.ATG" 
 out p);
 
-#line  1917 "cs.ATG" 
+#line  1920 "cs.ATG" 
 				if (p != null) lambda.Parameters.Add(p); 
 			}
 		}
 		Expect(21);
 		Expect(48);
 		LambdaExpressionBody(
-#line  1922 "cs.ATG" 
+#line  1925 "cs.ATG" 
 lambda);
 	}
 
 	void NewExpression(
-#line  1852 "cs.ATG" 
+#line  1855 "cs.ATG" 
 out Expression pexpr) {
 
-#line  1853 "cs.ATG" 
+#line  1856 "cs.ATG" 
 		pexpr = null;
 		List<Expression> parameters = new List<Expression>();
 		TypeReference type = null;
@@ -4801,65 +4813,65 @@ out Expression pexpr) {
 		Expect(89);
 		if (StartOf(10)) {
 			NonArrayType(
-#line  1860 "cs.ATG" 
+#line  1863 "cs.ATG" 
 out type);
 		}
 		if (la.kind == 16 || la.kind == 20) {
 			if (la.kind == 20) {
 
-#line  1866 "cs.ATG" 
+#line  1869 "cs.ATG" 
 				ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); 
 				lexer.NextToken();
 
-#line  1867 "cs.ATG" 
+#line  1870 "cs.ATG" 
 				if (type == null) Error("Cannot use an anonymous type with arguments for the constructor"); 
 				if (StartOf(24)) {
 					Argument(
-#line  1868 "cs.ATG" 
+#line  1871 "cs.ATG" 
 out expr);
 
-#line  1868 "cs.ATG" 
+#line  1871 "cs.ATG" 
 					if (expr != null) { parameters.Add(expr); } 
 					while (la.kind == 14) {
 						lexer.NextToken();
 						Argument(
-#line  1869 "cs.ATG" 
+#line  1872 "cs.ATG" 
 out expr);
 
-#line  1869 "cs.ATG" 
+#line  1872 "cs.ATG" 
 						if (expr != null) { parameters.Add(expr); } 
 					}
 				}
 				Expect(21);
 
-#line  1871 "cs.ATG" 
+#line  1874 "cs.ATG" 
 				pexpr = oce; 
 				if (la.kind == 16) {
 					CollectionOrObjectInitializer(
-#line  1872 "cs.ATG" 
+#line  1875 "cs.ATG" 
 out expr);
 
-#line  1872 "cs.ATG" 
+#line  1875 "cs.ATG" 
 					oce.ObjectInitializer = (CollectionInitializerExpression)expr; 
 				}
 			} else {
 
-#line  1873 "cs.ATG" 
+#line  1876 "cs.ATG" 
 				ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); 
 				CollectionOrObjectInitializer(
-#line  1874 "cs.ATG" 
+#line  1877 "cs.ATG" 
 out expr);
 
-#line  1874 "cs.ATG" 
+#line  1877 "cs.ATG" 
 				oce.ObjectInitializer = (CollectionInitializerExpression)expr; 
 
-#line  1875 "cs.ATG" 
+#line  1878 "cs.ATG" 
 				pexpr = oce; 
 			}
 		} else if (la.kind == 18) {
 			lexer.NextToken();
 
-#line  1880 "cs.ATG" 
+#line  1883 "cs.ATG" 
 			ArrayCreateExpression ace = new ArrayCreateExpression(type);
 			/* we must not change RankSpecifier on the null type reference*/
 			if (ace.CreateType.IsNull) { ace.CreateType = new TypeReference(""); }
@@ -4870,91 +4882,91 @@ out expr);
 				while (la.kind == 14) {
 					lexer.NextToken();
 
-#line  1887 "cs.ATG" 
+#line  1890 "cs.ATG" 
 					dims += 1; 
 				}
 				Expect(19);
 
-#line  1888 "cs.ATG" 
+#line  1891 "cs.ATG" 
 				ranks.Add(dims); dims = 0; 
 				while (la.kind == 18) {
 					lexer.NextToken();
 					while (la.kind == 14) {
 						lexer.NextToken();
 
-#line  1889 "cs.ATG" 
+#line  1892 "cs.ATG" 
 						++dims; 
 					}
 					Expect(19);
 
-#line  1889 "cs.ATG" 
+#line  1892 "cs.ATG" 
 					ranks.Add(dims); dims = 0; 
 				}
 
-#line  1890 "cs.ATG" 
+#line  1893 "cs.ATG" 
 				ace.CreateType.RankSpecifier = ranks.ToArray(); 
 				CollectionInitializer(
-#line  1891 "cs.ATG" 
+#line  1894 "cs.ATG" 
 out expr);
 
-#line  1891 "cs.ATG" 
+#line  1894 "cs.ATG" 
 				ace.ArrayInitializer = (CollectionInitializerExpression)expr; 
 			} else if (StartOf(6)) {
 				Expr(
-#line  1892 "cs.ATG" 
+#line  1895 "cs.ATG" 
 out expr);
 
-#line  1892 "cs.ATG" 
+#line  1895 "cs.ATG" 
 				if (expr != null) parameters.Add(expr); 
 				while (la.kind == 14) {
 					lexer.NextToken();
 
-#line  1893 "cs.ATG" 
+#line  1896 "cs.ATG" 
 					dims += 1; 
 					Expr(
-#line  1894 "cs.ATG" 
+#line  1897 "cs.ATG" 
 out expr);
 
-#line  1894 "cs.ATG" 
+#line  1897 "cs.ATG" 
 					if (expr != null) parameters.Add(expr); 
 				}
 				Expect(19);
 
-#line  1896 "cs.ATG" 
+#line  1899 "cs.ATG" 
 				ranks.Add(dims); ace.Arguments = parameters; dims = 0; 
 				while (la.kind == 18) {
 					lexer.NextToken();
 					while (la.kind == 14) {
 						lexer.NextToken();
 
-#line  1897 "cs.ATG" 
+#line  1900 "cs.ATG" 
 						++dims; 
 					}
 					Expect(19);
 
-#line  1897 "cs.ATG" 
+#line  1900 "cs.ATG" 
 					ranks.Add(dims); dims = 0; 
 				}
 
-#line  1898 "cs.ATG" 
+#line  1901 "cs.ATG" 
 				ace.CreateType.RankSpecifier = ranks.ToArray(); 
 				if (la.kind == 16) {
 					CollectionInitializer(
-#line  1899 "cs.ATG" 
+#line  1902 "cs.ATG" 
 out expr);
 
-#line  1899 "cs.ATG" 
+#line  1902 "cs.ATG" 
 					ace.ArrayInitializer = (CollectionInitializerExpression)expr; 
 				}
-			} else SynErr(206);
-		} else SynErr(207);
+			} else SynErr(207);
+		} else SynErr(208);
 	}
 
 	void AnonymousMethodExpr(
-#line  1967 "cs.ATG" 
+#line  1970 "cs.ATG" 
 out Expression outExpr) {
 
-#line  1969 "cs.ATG" 
+#line  1972 "cs.ATG" 
 		AnonymousMethodExpression expr = new AnonymousMethodExpression();
 		expr.StartLocation = t.Location;
 		BlockStatement stmt;
@@ -4965,438 +4977,438 @@ out Expression outExpr) {
 			lexer.NextToken();
 			if (StartOf(11)) {
 				FormalParameterList(
-#line  1978 "cs.ATG" 
+#line  1981 "cs.ATG" 
 p);
 
-#line  1978 "cs.ATG" 
+#line  1981 "cs.ATG" 
 				expr.Parameters = p; 
 			}
 			Expect(21);
 
-#line  1980 "cs.ATG" 
+#line  1983 "cs.ATG" 
 			expr.HasParameterList = true; 
 		}
 		BlockInsideExpression(
-#line  1982 "cs.ATG" 
+#line  1985 "cs.ATG" 
 out stmt);
 
-#line  1982 "cs.ATG" 
+#line  1985 "cs.ATG" 
 		expr.Body  = stmt; 
 
-#line  1983 "cs.ATG" 
+#line  1986 "cs.ATG" 
 		expr.EndLocation = t.Location; 
 	}
 
 	void TypeArgumentList(
-#line  2170 "cs.ATG" 
+#line  2173 "cs.ATG" 
 out List<TypeReference> types, bool canBeUnbound) {
 
-#line  2172 "cs.ATG" 
+#line  2175 "cs.ATG" 
 		types = new List<TypeReference>();
 		TypeReference type = null;
 		
 		Expect(23);
 		if (
-#line  2177 "cs.ATG" 
+#line  2180 "cs.ATG" 
 canBeUnbound && (la.kind == Tokens.GreaterThan || la.kind == Tokens.Comma)) {
 
-#line  2178 "cs.ATG" 
+#line  2181 "cs.ATG" 
 			types.Add(TypeReference.Null); 
 			while (la.kind == 14) {
 				lexer.NextToken();
 
-#line  2179 "cs.ATG" 
+#line  2182 "cs.ATG" 
 				types.Add(TypeReference.Null); 
 			}
 		} else if (StartOf(10)) {
 			Type(
-#line  2180 "cs.ATG" 
+#line  2183 "cs.ATG" 
 out type);
 
-#line  2180 "cs.ATG" 
+#line  2183 "cs.ATG" 
 			if (type != null) { types.Add(type); } 
 			while (la.kind == 14) {
 				lexer.NextToken();
 				Type(
-#line  2181 "cs.ATG" 
+#line  2184 "cs.ATG" 
 out type);
 
-#line  2181 "cs.ATG" 
+#line  2184 "cs.ATG" 
 				if (type != null) { types.Add(type); } 
 			}
-		} else SynErr(208);
+		} else SynErr(209);
 		Expect(22);
 	}
 
 	void LambdaExpressionParameter(
-#line  1939 "cs.ATG" 
+#line  1942 "cs.ATG" 
 out ParameterDeclarationExpression p) {
 
-#line  1940 "cs.ATG" 
+#line  1943 "cs.ATG" 
 		Location start = la.Location; p = null;
 		TypeReference type;
 		
 		if (
-#line  1944 "cs.ATG" 
+#line  1947 "cs.ATG" 
 Peek(1).kind == Tokens.Comma || Peek(1).kind == Tokens.CloseParenthesis) {
 			Identifier();
 
-#line  1946 "cs.ATG" 
+#line  1949 "cs.ATG" 
 			p = new ParameterDeclarationExpression(null, t.val);
 			p.StartLocation = start; p.EndLocation = t.EndLocation;
 			
 		} else if (StartOf(10)) {
 			Type(
-#line  1949 "cs.ATG" 
+#line  1952 "cs.ATG" 
 out type);
 			Identifier();
 
-#line  1951 "cs.ATG" 
+#line  1954 "cs.ATG" 
 			p = new ParameterDeclarationExpression(type, t.val);
 			p.StartLocation = start; p.EndLocation = t.EndLocation;
 			
-		} else SynErr(209);
+		} else SynErr(210);
 	}
 
 	void LambdaExpressionBody(
-#line  1957 "cs.ATG" 
+#line  1960 "cs.ATG" 
 LambdaExpression lambda) {
 
-#line  1958 "cs.ATG" 
+#line  1961 "cs.ATG" 
 		Expression expr; BlockStatement stmt; 
 		if (la.kind == 16) {
 			BlockInsideExpression(
-#line  1961 "cs.ATG" 
+#line  1964 "cs.ATG" 
 out stmt);
 
-#line  1961 "cs.ATG" 
+#line  1964 "cs.ATG" 
 			lambda.StatementBody = stmt; 
 		} else if (StartOf(6)) {
 			Expr(
-#line  1962 "cs.ATG" 
+#line  1965 "cs.ATG" 
 out expr);
 
-#line  1962 "cs.ATG" 
+#line  1965 "cs.ATG" 
 			lambda.ExpressionBody = expr; 
-		} else SynErr(210);
+		} else SynErr(211);
 
-#line  1964 "cs.ATG" 
+#line  1967 "cs.ATG" 
 		lambda.EndLocation = t.EndLocation; 
 	}
 
 	void BlockInsideExpression(
-#line  1986 "cs.ATG" 
+#line  1989 "cs.ATG" 
 out BlockStatement outStmt) {
 
-#line  1987 "cs.ATG" 
+#line  1990 "cs.ATG" 
 		Statement stmt = null; outStmt = null; 
 
-#line  1991 "cs.ATG" 
+#line  1994 "cs.ATG" 
 		if (compilationUnit != null) { 
 		Block(
-#line  1992 "cs.ATG" 
+#line  1995 "cs.ATG" 
 out stmt);
 
-#line  1992 "cs.ATG" 
+#line  1995 "cs.ATG" 
 		outStmt = (BlockStatement)stmt; 
 
-#line  1993 "cs.ATG" 
+#line  1996 "cs.ATG" 
 		} else { 
 		Expect(16);
 
-#line  1995 "cs.ATG" 
+#line  1998 "cs.ATG" 
 		lexer.SkipCurrentBlock(0); 
 		Expect(17);
 
-#line  1997 "cs.ATG" 
+#line  2000 "cs.ATG" 
 		} 
 	}
 
 	void ConditionalAndExpr(
-#line  2006 "cs.ATG" 
+#line  2009 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2007 "cs.ATG" 
+#line  2010 "cs.ATG" 
 		Expression expr; 
 		InclusiveOrExpr(
-#line  2009 "cs.ATG" 
+#line  2012 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 25) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2009 "cs.ATG" 
+#line  2012 "cs.ATG" 
 out expr);
 			InclusiveOrExpr(
-#line  2009 "cs.ATG" 
+#line  2012 "cs.ATG" 
 ref expr);
 
-#line  2009 "cs.ATG" 
+#line  2012 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr);  
 		}
 	}
 
 	void InclusiveOrExpr(
-#line  2012 "cs.ATG" 
+#line  2015 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2013 "cs.ATG" 
+#line  2016 "cs.ATG" 
 		Expression expr; 
 		ExclusiveOrExpr(
-#line  2015 "cs.ATG" 
+#line  2018 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 29) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2015 "cs.ATG" 
+#line  2018 "cs.ATG" 
 out expr);
 			ExclusiveOrExpr(
-#line  2015 "cs.ATG" 
+#line  2018 "cs.ATG" 
 ref expr);
 
-#line  2015 "cs.ATG" 
+#line  2018 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr);  
 		}
 	}
 
 	void ExclusiveOrExpr(
-#line  2018 "cs.ATG" 
+#line  2021 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2019 "cs.ATG" 
+#line  2022 "cs.ATG" 
 		Expression expr; 
 		AndExpr(
-#line  2021 "cs.ATG" 
+#line  2024 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 30) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2021 "cs.ATG" 
+#line  2024 "cs.ATG" 
 out expr);
 			AndExpr(
-#line  2021 "cs.ATG" 
+#line  2024 "cs.ATG" 
 ref expr);
 
-#line  2021 "cs.ATG" 
+#line  2024 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr);  
 		}
 	}
 
 	void AndExpr(
-#line  2024 "cs.ATG" 
+#line  2027 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2025 "cs.ATG" 
+#line  2028 "cs.ATG" 
 		Expression expr; 
 		EqualityExpr(
-#line  2027 "cs.ATG" 
+#line  2030 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 28) {
 			lexer.NextToken();
 			UnaryExpr(
-#line  2027 "cs.ATG" 
+#line  2030 "cs.ATG" 
 out expr);
 			EqualityExpr(
-#line  2027 "cs.ATG" 
+#line  2030 "cs.ATG" 
 ref expr);
 
-#line  2027 "cs.ATG" 
+#line  2030 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr);  
 		}
 	}
 
 	void EqualityExpr(
-#line  2030 "cs.ATG" 
+#line  2033 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2032 "cs.ATG" 
+#line  2035 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		RelationalExpr(
-#line  2036 "cs.ATG" 
+#line  2039 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 33 || la.kind == 34) {
 			if (la.kind == 34) {
 				lexer.NextToken();
 
-#line  2039 "cs.ATG" 
+#line  2042 "cs.ATG" 
 				op = BinaryOperatorType.InEquality; 
 			} else {
 				lexer.NextToken();
 
-#line  2040 "cs.ATG" 
+#line  2043 "cs.ATG" 
 				op = BinaryOperatorType.Equality; 
 			}
 			UnaryExpr(
-#line  2042 "cs.ATG" 
+#line  2045 "cs.ATG" 
 out expr);
 			RelationalExpr(
-#line  2042 "cs.ATG" 
+#line  2045 "cs.ATG" 
 ref expr);
 
-#line  2042 "cs.ATG" 
+#line  2045 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void RelationalExpr(
-#line  2046 "cs.ATG" 
+#line  2049 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2048 "cs.ATG" 
+#line  2051 "cs.ATG" 
 		TypeReference type;
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		ShiftExpr(
-#line  2053 "cs.ATG" 
+#line  2056 "cs.ATG" 
 ref outExpr);
 		while (StartOf(34)) {
 			if (StartOf(35)) {
 				if (la.kind == 23) {
 					lexer.NextToken();
 
-#line  2055 "cs.ATG" 
+#line  2058 "cs.ATG" 
 					op = BinaryOperatorType.LessThan; 
 				} else if (la.kind == 22) {
 					lexer.NextToken();
 
-#line  2056 "cs.ATG" 
+#line  2059 "cs.ATG" 
 					op = BinaryOperatorType.GreaterThan; 
 				} else if (la.kind == 36) {
 					lexer.NextToken();
 
-#line  2057 "cs.ATG" 
+#line  2060 "cs.ATG" 
 					op = BinaryOperatorType.LessThanOrEqual; 
 				} else if (la.kind == 35) {
 					lexer.NextToken();
 
-#line  2058 "cs.ATG" 
+#line  2061 "cs.ATG" 
 					op = BinaryOperatorType.GreaterThanOrEqual; 
-				} else SynErr(211);
+				} else SynErr(212);
 				UnaryExpr(
-#line  2060 "cs.ATG" 
+#line  2063 "cs.ATG" 
 out expr);
 				ShiftExpr(
-#line  2061 "cs.ATG" 
+#line  2064 "cs.ATG" 
 ref expr);
 
-#line  2062 "cs.ATG" 
+#line  2065 "cs.ATG" 
 				outExpr = new BinaryOperatorExpression(outExpr, op, expr); 
 			} else {
 				if (la.kind == 85) {
 					lexer.NextToken();
 					TypeWithRestriction(
-#line  2065 "cs.ATG" 
+#line  2068 "cs.ATG" 
 out type, false, false);
 					if (
-#line  2066 "cs.ATG" 
-la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false) {
+#line  2069 "cs.ATG" 
+la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) {
 						NullableQuestionMark(
-#line  2067 "cs.ATG" 
+#line  2070 "cs.ATG" 
 ref type);
 					}
 
-#line  2068 "cs.ATG" 
+#line  2071 "cs.ATG" 
 					outExpr = new TypeOfIsExpression(outExpr, type); 
 				} else if (la.kind == 50) {
 					lexer.NextToken();
 					TypeWithRestriction(
-#line  2070 "cs.ATG" 
+#line  2073 "cs.ATG" 
 out type, false, false);
 					if (
-#line  2071 "cs.ATG" 
-la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false) {
+#line  2074 "cs.ATG" 
+la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) {
 						NullableQuestionMark(
-#line  2072 "cs.ATG" 
+#line  2075 "cs.ATG" 
 ref type);
 					}
 
-#line  2073 "cs.ATG" 
+#line  2076 "cs.ATG" 
 					outExpr = new CastExpression(type, outExpr, CastType.TryCast); 
-				} else SynErr(212);
+				} else SynErr(213);
 			}
 		}
 	}
 
 	void ShiftExpr(
-#line  2078 "cs.ATG" 
+#line  2081 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2080 "cs.ATG" 
+#line  2083 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		AdditiveExpr(
-#line  2084 "cs.ATG" 
+#line  2087 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 37 || 
-#line  2087 "cs.ATG" 
+#line  2090 "cs.ATG" 
 IsShiftRight()) {
 			if (la.kind == 37) {
 				lexer.NextToken();
 
-#line  2086 "cs.ATG" 
+#line  2089 "cs.ATG" 
 				op = BinaryOperatorType.ShiftLeft; 
 			} else {
 				Expect(22);
 				Expect(22);
 
-#line  2088 "cs.ATG" 
+#line  2091 "cs.ATG" 
 				op = BinaryOperatorType.ShiftRight; 
 			}
 			UnaryExpr(
-#line  2091 "cs.ATG" 
+#line  2094 "cs.ATG" 
 out expr);
 			AdditiveExpr(
-#line  2091 "cs.ATG" 
+#line  2094 "cs.ATG" 
 ref expr);
 
-#line  2091 "cs.ATG" 
+#line  2094 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void AdditiveExpr(
-#line  2095 "cs.ATG" 
+#line  2098 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2097 "cs.ATG" 
+#line  2100 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
 		MultiplicativeExpr(
-#line  2101 "cs.ATG" 
+#line  2104 "cs.ATG" 
 ref outExpr);
 		while (la.kind == 4 || la.kind == 5) {
 			if (la.kind == 4) {
 				lexer.NextToken();
 
-#line  2104 "cs.ATG" 
+#line  2107 "cs.ATG" 
 				op = BinaryOperatorType.Add; 
 			} else {
 				lexer.NextToken();
 
-#line  2105 "cs.ATG" 
+#line  2108 "cs.ATG" 
 				op = BinaryOperatorType.Subtract; 
 			}
 			UnaryExpr(
-#line  2107 "cs.ATG" 
+#line  2110 "cs.ATG" 
 out expr);
 			MultiplicativeExpr(
-#line  2107 "cs.ATG" 
+#line  2110 "cs.ATG" 
 ref expr);
 
-#line  2107 "cs.ATG" 
+#line  2110 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr);  
 		}
 	}
 
 	void MultiplicativeExpr(
-#line  2111 "cs.ATG" 
+#line  2114 "cs.ATG" 
 ref Expression outExpr) {
 
-#line  2113 "cs.ATG" 
+#line  2116 "cs.ATG" 
 		Expression expr;
 		BinaryOperatorType op = BinaryOperatorType.None;
 		
@@ -5404,82 +5416,82 @@ ref Expression outExpr) {
 			if (la.kind == 6) {
 				lexer.NextToken();
 
-#line  2119 "cs.ATG" 
+#line  2122 "cs.ATG" 
 				op = BinaryOperatorType.Multiply; 
 			} else if (la.kind == 7) {
 				lexer.NextToken();
 
-#line  2120 "cs.ATG" 
+#line  2123 "cs.ATG" 
 				op = BinaryOperatorType.Divide; 
 			} else {
 				lexer.NextToken();
 
-#line  2121 "cs.ATG" 
+#line  2124 "cs.ATG" 
 				op = BinaryOperatorType.Modulus; 
 			}
 			UnaryExpr(
-#line  2123 "cs.ATG" 
+#line  2126 "cs.ATG" 
 out expr);
 
-#line  2123 "cs.ATG" 
+#line  2126 "cs.ATG" 
 			outExpr = new BinaryOperatorExpression(outExpr, op, expr); 
 		}
 	}
 
 	void TypeParameterConstraintsClauseBase(
-#line  2227 "cs.ATG" 
+#line  2230 "cs.ATG" 
 out TypeReference type) {
 
-#line  2228 "cs.ATG" 
+#line  2231 "cs.ATG" 
 		TypeReference t; type = null; 
 		if (la.kind == 109) {
 			lexer.NextToken();
 
-#line  2230 "cs.ATG" 
+#line  2233 "cs.ATG" 
 			type = TypeReference.StructConstraint; 
 		} else if (la.kind == 59) {
 			lexer.NextToken();
 
-#line  2231 "cs.ATG" 
+#line  2234 "cs.ATG" 
 			type = TypeReference.ClassConstraint; 
 		} else if (la.kind == 89) {
 			lexer.NextToken();
 			Expect(20);
 			Expect(21);
 
-#line  2232 "cs.ATG" 
+#line  2235 "cs.ATG" 
 			type = TypeReference.NewConstraint; 
 		} else if (StartOf(10)) {
 			Type(
-#line  2233 "cs.ATG" 
+#line  2236 "cs.ATG" 
 out t);
 
-#line  2233 "cs.ATG" 
+#line  2236 "cs.ATG" 
 			type = t; 
-		} else SynErr(213);
+		} else SynErr(214);
 	}
 
 	void QueryExpressionFromClause(
-#line  2246 "cs.ATG" 
+#line  2249 "cs.ATG" 
 out QueryExpressionFromClause fc) {
 
-#line  2247 "cs.ATG" 
+#line  2250 "cs.ATG" 
 		fc = new QueryExpressionFromClause(); fc.StartLocation = la.Location; 
 		
 		Expect(137);
 		QueryExpressionFromOrJoinClause(
-#line  2251 "cs.ATG" 
+#line  2254 "cs.ATG" 
 fc);
 
-#line  2252 "cs.ATG" 
+#line  2255 "cs.ATG" 
 		fc.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionBody(
-#line  2282 "cs.ATG" 
+#line  2285 "cs.ATG" 
 QueryExpression q) {
 
-#line  2283 "cs.ATG" 
+#line  2286 "cs.ATG" 
 		QueryExpressionFromClause fromClause;     QueryExpressionWhereClause whereClause;
 		QueryExpressionLetClause letClause;       QueryExpressionJoinClause joinClause;
 		QueryExpressionSelectClause selectClause; QueryExpressionGroupClause groupClause;
@@ -5488,287 +5500,287 @@ QueryExpression q) {
 		while (StartOf(36)) {
 			if (la.kind == 137) {
 				QueryExpressionFromClause(
-#line  2289 "cs.ATG" 
+#line  2292 "cs.ATG" 
 out fromClause);
 
-#line  2289 "cs.ATG" 
+#line  2292 "cs.ATG" 
 				SafeAdd<QueryExpressionClause>(q, q.FromLetWhereClauses, fromClause); 
 			} else if (la.kind == 127) {
 				QueryExpressionWhereClause(
-#line  2290 "cs.ATG" 
+#line  2293 "cs.ATG" 
 out whereClause);
 
-#line  2290 "cs.ATG" 
+#line  2293 "cs.ATG" 
 				SafeAdd<QueryExpressionClause>(q, q.FromLetWhereClauses, whereClause); 
 			} else if (la.kind == 141) {
 				QueryExpressionLetClause(
-#line  2291 "cs.ATG" 
+#line  2294 "cs.ATG" 
 out letClause);
 
-#line  2291 "cs.ATG" 
+#line  2294 "cs.ATG" 
 				SafeAdd<QueryExpressionClause>(q, q.FromLetWhereClauses, letClause); 
 			} else {
 				QueryExpressionJoinClause(
-#line  2292 "cs.ATG" 
+#line  2295 "cs.ATG" 
 out joinClause);
 
-#line  2292 "cs.ATG" 
+#line  2295 "cs.ATG" 
 				SafeAdd<QueryExpressionClause>(q, q.FromLetWhereClauses, joinClause); 
 			}
 		}
 		if (la.kind == 140) {
 			QueryExpressionOrderByClause(
-#line  2294 "cs.ATG" 
+#line  2297 "cs.ATG" 
 q);
 		}
 		if (la.kind == 133) {
 			QueryExpressionSelectClause(
-#line  2295 "cs.ATG" 
+#line  2298 "cs.ATG" 
 out selectClause);
 
-#line  2295 "cs.ATG" 
+#line  2298 "cs.ATG" 
 			q.SelectOrGroupClause = selectClause; 
 		} else if (la.kind == 134) {
 			QueryExpressionGroupClause(
-#line  2296 "cs.ATG" 
+#line  2299 "cs.ATG" 
 out groupClause);
 
-#line  2296 "cs.ATG" 
+#line  2299 "cs.ATG" 
 			q.SelectOrGroupClause = groupClause; 
-		} else SynErr(214);
+		} else SynErr(215);
 		if (la.kind == 136) {
 			QueryExpressionIntoClause(
-#line  2298 "cs.ATG" 
+#line  2301 "cs.ATG" 
 out intoClause);
 
-#line  2298 "cs.ATG" 
+#line  2301 "cs.ATG" 
 			q.IntoClause = intoClause; 
 		}
 	}
 
 	void QueryExpressionFromOrJoinClause(
-#line  2272 "cs.ATG" 
+#line  2275 "cs.ATG" 
 QueryExpressionFromOrJoinClause fjc) {
 
-#line  2273 "cs.ATG" 
+#line  2276 "cs.ATG" 
 		TypeReference type; Expression expr; 
 
-#line  2275 "cs.ATG" 
+#line  2278 "cs.ATG" 
 		fjc.Type = null; 
 		Identifier();
 
-#line  2277 "cs.ATG" 
+#line  2280 "cs.ATG" 
 		fjc.Identifier = t.val; 
 		Expect(81);
 		Expr(
-#line  2279 "cs.ATG" 
+#line  2282 "cs.ATG" 
 out expr);
 
-#line  2279 "cs.ATG" 
+#line  2282 "cs.ATG" 
 		fjc.InExpression = expr; 
 	}
 
 	void QueryExpressionJoinClause(
-#line  2255 "cs.ATG" 
+#line  2258 "cs.ATG" 
 out QueryExpressionJoinClause jc) {
 
-#line  2256 "cs.ATG" 
+#line  2259 "cs.ATG" 
 		jc = new QueryExpressionJoinClause(); jc.StartLocation = la.Location; 
 		Expression expr;
 		
 		Expect(142);
 		QueryExpressionFromOrJoinClause(
-#line  2261 "cs.ATG" 
+#line  2264 "cs.ATG" 
 jc);
 		Expect(143);
 		Expr(
-#line  2263 "cs.ATG" 
+#line  2266 "cs.ATG" 
 out expr);
 
-#line  2263 "cs.ATG" 
+#line  2266 "cs.ATG" 
 		jc.OnExpression = expr; 
 		Expect(144);
 		Expr(
-#line  2265 "cs.ATG" 
+#line  2268 "cs.ATG" 
 out expr);
 
-#line  2265 "cs.ATG" 
+#line  2268 "cs.ATG" 
 		jc.EqualsExpression = expr; 
 		if (la.kind == 136) {
 			lexer.NextToken();
 			Identifier();
 
-#line  2267 "cs.ATG" 
+#line  2270 "cs.ATG" 
 			jc.IntoIdentifier = t.val; 
 		}
 
-#line  2269 "cs.ATG" 
+#line  2272 "cs.ATG" 
 		jc.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionWhereClause(
-#line  2301 "cs.ATG" 
+#line  2304 "cs.ATG" 
 out QueryExpressionWhereClause wc) {
 
-#line  2302 "cs.ATG" 
+#line  2305 "cs.ATG" 
 		Expression expr; wc = new QueryExpressionWhereClause(); wc.StartLocation = la.Location; 
 		Expect(127);
 		Expr(
-#line  2305 "cs.ATG" 
+#line  2308 "cs.ATG" 
 out expr);
 
-#line  2305 "cs.ATG" 
+#line  2308 "cs.ATG" 
 		wc.Condition = expr; 
 
-#line  2306 "cs.ATG" 
+#line  2309 "cs.ATG" 
 		wc.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionLetClause(
-#line  2309 "cs.ATG" 
+#line  2312 "cs.ATG" 
 out QueryExpressionLetClause wc) {
 
-#line  2310 "cs.ATG" 
+#line  2313 "cs.ATG" 
 		Expression expr; wc = new QueryExpressionLetClause(); wc.StartLocation = la.Location; 
 		Expect(141);
 		Identifier();
 
-#line  2313 "cs.ATG" 
+#line  2316 "cs.ATG" 
 		wc.Identifier = t.val; 
 		Expect(3);
 		Expr(
-#line  2315 "cs.ATG" 
+#line  2318 "cs.ATG" 
 out expr);
 
-#line  2315 "cs.ATG" 
+#line  2318 "cs.ATG" 
 		wc.Expression = expr; 
 
-#line  2316 "cs.ATG" 
+#line  2319 "cs.ATG" 
 		wc.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionOrderByClause(
-#line  2319 "cs.ATG" 
+#line  2322 "cs.ATG" 
 QueryExpression q) {
 
-#line  2320 "cs.ATG" 
+#line  2323 "cs.ATG" 
 		QueryExpressionOrdering ordering; 
 		Expect(140);
 		QueryExpressionOrderingClause(
-#line  2323 "cs.ATG" 
+#line  2326 "cs.ATG" 
 out ordering);
 
-#line  2323 "cs.ATG" 
+#line  2326 "cs.ATG" 
 		SafeAdd(q, q.Orderings, ordering); 
 		while (la.kind == 14) {
 			lexer.NextToken();
 			QueryExpressionOrderingClause(
-#line  2325 "cs.ATG" 
+#line  2328 "cs.ATG" 
 out ordering);
 
-#line  2325 "cs.ATG" 
+#line  2328 "cs.ATG" 
 			SafeAdd(q, q.Orderings, ordering); 
 		}
 	}
 
 	void QueryExpressionSelectClause(
-#line  2339 "cs.ATG" 
+#line  2342 "cs.ATG" 
 out QueryExpressionSelectClause sc) {
 
-#line  2340 "cs.ATG" 
+#line  2343 "cs.ATG" 
 		Expression expr; sc = new QueryExpressionSelectClause(); sc.StartLocation = la.Location; 
 		Expect(133);
 		Expr(
-#line  2343 "cs.ATG" 
+#line  2346 "cs.ATG" 
 out expr);
 
-#line  2343 "cs.ATG" 
+#line  2346 "cs.ATG" 
 		sc.Projection = expr; 
 
-#line  2344 "cs.ATG" 
+#line  2347 "cs.ATG" 
 		sc.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionGroupClause(
-#line  2347 "cs.ATG" 
+#line  2350 "cs.ATG" 
 out QueryExpressionGroupClause gc) {
 
-#line  2348 "cs.ATG" 
+#line  2351 "cs.ATG" 
 		Expression expr; gc = new QueryExpressionGroupClause(); gc.StartLocation = la.Location; 
 		Expect(134);
 		Expr(
-#line  2351 "cs.ATG" 
+#line  2354 "cs.ATG" 
 out expr);
 
-#line  2351 "cs.ATG" 
+#line  2354 "cs.ATG" 
 		gc.Projection = expr; 
 		Expect(135);
 		Expr(
-#line  2353 "cs.ATG" 
+#line  2356 "cs.ATG" 
 out expr);
 
-#line  2353 "cs.ATG" 
+#line  2356 "cs.ATG" 
 		gc.GroupBy = expr; 
 
-#line  2354 "cs.ATG" 
+#line  2357 "cs.ATG" 
 		gc.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionIntoClause(
-#line  2357 "cs.ATG" 
+#line  2360 "cs.ATG" 
 out QueryExpressionIntoClause ic) {
 
-#line  2358 "cs.ATG" 
+#line  2361 "cs.ATG" 
 		ic = new QueryExpressionIntoClause(); ic.StartLocation = la.Location; 
 		Expect(136);
 		Identifier();
 
-#line  2361 "cs.ATG" 
+#line  2364 "cs.ATG" 
 		ic.IntoIdentifier = t.val; 
 
-#line  2362 "cs.ATG" 
+#line  2365 "cs.ATG" 
 		ic.ContinuedQuery = new QueryExpression(); 
 
-#line  2363 "cs.ATG" 
+#line  2366 "cs.ATG" 
 		ic.ContinuedQuery.StartLocation = la.Location; 
 		QueryExpressionBody(
-#line  2364 "cs.ATG" 
+#line  2367 "cs.ATG" 
 ic.ContinuedQuery);
 
-#line  2365 "cs.ATG" 
+#line  2368 "cs.ATG" 
 		ic.ContinuedQuery.EndLocation = t.EndLocation; 
 
-#line  2366 "cs.ATG" 
+#line  2369 "cs.ATG" 
 		ic.EndLocation = t.EndLocation; 
 	}
 
 	void QueryExpressionOrderingClause(
-#line  2329 "cs.ATG" 
+#line  2332 "cs.ATG" 
 out QueryExpressionOrdering ordering) {
 
-#line  2330 "cs.ATG" 
+#line  2333 "cs.ATG" 
 		Expression expr; ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; 
 		Expr(
-#line  2332 "cs.ATG" 
+#line  2335 "cs.ATG" 
 out expr);
 
-#line  2332 "cs.ATG" 
+#line  2335 "cs.ATG" 
 		ordering.Criteria = expr; 
 		if (la.kind == 138 || la.kind == 139) {
 			if (la.kind == 138) {
 				lexer.NextToken();
 
-#line  2333 "cs.ATG" 
+#line  2336 "cs.ATG" 
 				ordering.Direction = QueryExpressionOrderingDirection.Ascending; 
 			} else {
 				lexer.NextToken();
 
-#line  2334 "cs.ATG" 
+#line  2337 "cs.ATG" 
 				ordering.Direction = QueryExpressionOrderingDirection.Descending; 
 			}
 		}
 
-#line  2336 "cs.ATG" 
+#line  2339 "cs.ATG" 
 		ordering.EndLocation = t.EndLocation; 
 	}
 
@@ -5976,29 +5988,30 @@ out expr);
 			case 189: s = "invalid Statement"; break;
 			case 190: s = "invalid AssignmentOperator"; break;
 			case 191: s = "invalid ObjectPropertyInitializerOrVariableInitializer"; break;
-			case 192: s = "invalid EmbeddedStatement"; break;
+			case 192: s = "invalid ObjectPropertyInitializerOrVariableInitializer"; break;
 			case 193: s = "invalid EmbeddedStatement"; break;
 			case 194: s = "invalid EmbeddedStatement"; break;
-			case 195: s = "invalid ForInitializer"; break;
-			case 196: s = "invalid GotoStatement"; break;
-			case 197: s = "invalid TryStatement"; break;
-			case 198: s = "invalid ResourceAcquisition"; break;
-			case 199: s = "invalid SwitchLabel"; break;
-			case 200: s = "invalid CatchClauses"; break;
-			case 201: s = "invalid UnaryExpr"; break;
-			case 202: s = "invalid PrimaryExpr"; break;
+			case 195: s = "invalid EmbeddedStatement"; break;
+			case 196: s = "invalid ForInitializer"; break;
+			case 197: s = "invalid GotoStatement"; break;
+			case 198: s = "invalid TryStatement"; break;
+			case 199: s = "invalid ResourceAcquisition"; break;
+			case 200: s = "invalid SwitchLabel"; break;
+			case 201: s = "invalid CatchClauses"; break;
+			case 202: s = "invalid UnaryExpr"; break;
 			case 203: s = "invalid PrimaryExpr"; break;
 			case 204: s = "invalid PrimaryExpr"; break;
 			case 205: s = "invalid PrimaryExpr"; break;
-			case 206: s = "invalid NewExpression"; break;
+			case 206: s = "invalid PrimaryExpr"; break;
 			case 207: s = "invalid NewExpression"; break;
-			case 208: s = "invalid TypeArgumentList"; break;
-			case 209: s = "invalid LambdaExpressionParameter"; break;
-			case 210: s = "invalid LambdaExpressionBody"; break;
-			case 211: s = "invalid RelationalExpr"; break;
+			case 208: s = "invalid NewExpression"; break;
+			case 209: s = "invalid TypeArgumentList"; break;
+			case 210: s = "invalid LambdaExpressionParameter"; break;
+			case 211: s = "invalid LambdaExpressionBody"; break;
 			case 212: s = "invalid RelationalExpr"; break;
-			case 213: s = "invalid TypeParameterConstraintsClauseBase"; break;
-			case 214: s = "invalid QueryExpressionBody"; break;
+			case 213: s = "invalid RelationalExpr"; break;
+			case 214: s = "invalid TypeParameterConstraintsClauseBase"; break;
+			case 215: s = "invalid QueryExpressionBody"; break;
 
 			default: s = "error " + errorNumber; break;
 		}
diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG
index 20bcf5a008..b806566f62 100644
--- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG
+++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG
@@ -1352,7 +1352,7 @@ CollectionInitializer<out Expression outExpr>
 	CollectionInitializerExpression initializer = new CollectionInitializerExpression();
 .)
 =
-	"{"
+	"{" (. initializer.StartLocation = t.Location; .)
 	[	VariableInitializer<out expr>
 		(. if (expr != null) { initializer.CreateExpressions.Add(expr); } .)
 		{ IF (NotFinalComma())
@@ -1361,7 +1361,7 @@ CollectionInitializer<out Expression outExpr>
 		}
 		[ "," ]
 	]
-	"}" (. outExpr = initializer; .)
+	"}" (. initializer.EndLocation = t.Location; outExpr = initializer; .)
 .
 
 CollectionOrObjectInitializer<out Expression outExpr>
@@ -1370,7 +1370,7 @@ CollectionOrObjectInitializer<out Expression outExpr>
 	CollectionInitializerExpression initializer = new CollectionInitializerExpression();
 .)
 =
-	"{"
+	"{" (. initializer.StartLocation = t.Location; .)
 	[	ObjectPropertyInitializerOrVariableInitializer<out expr>
 		(. if (expr != null) { initializer.CreateExpressions.Add(expr); } .)
 		{ IF (NotFinalComma())
@@ -1379,7 +1379,7 @@ CollectionOrObjectInitializer<out Expression outExpr>
 		}
 		[ "," ]
 	]
-	"}" (. outExpr = initializer; .)
+	"}" (. initializer.EndLocation = t.Location; outExpr = initializer; .)
 .
 
 ObjectPropertyInitializerOrVariableInitializer<out Expression expr>
@@ -1387,11 +1387,14 @@ ObjectPropertyInitializerOrVariableInitializer<out Expression expr>
 =
 ( IF (IdentAndAsgn())
 	Identifier
-	(. IdentifierExpression l = new IdentifierExpression(t.val);
-	   l.StartLocation = t.Location; l.EndLocation = t.EndLocation;
+	(. NamedArgumentExpression nae = new NamedArgumentExpression(t.val, null);
+	   nae.StartLocation = t.Location;
 	   Expression r = null; .)
-	"=" VariableInitializer <out r>
-	(. expr = new AssignmentExpression(l, AssignmentOperatorType.Assign, r); .)
+	"=" 
+	( CollectionOrObjectInitializer<out r>
+	| VariableInitializer <out r> )
+	(. nae.Expression = r; nae.EndLocation = t.EndLocation; expr = nae; .)
+	
 |	VariableInitializer <out expr>
 )
 .
@@ -2063,12 +2066,12 @@ RelationalExpr<ref Expression outExpr>
 	|
 		(	"is"
 			TypeWithRestriction<out type, false, false>
-			[ IF (la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false)
+			[ IF (la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind))
 				NullableQuestionMark<ref type> ]
 			(. outExpr = new TypeOfIsExpression(outExpr, type); .)
 		|	"as"
 			TypeWithRestriction<out type, false, false>
-			[ IF (la.kind == Tokens.Question && Tokens.CastFollower[Peek(1).kind] == false)
+			[ IF (la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind))
 				NullableQuestionMark<ref type> ]
 			(. outExpr = new CastExpression(type, outExpr, CastType.TryCast); .)
 		)
diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/CastExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/CastExpressionTests.cs
index f042561f22..c32dad0e8f 100644
--- a/src/Libraries/NRefactory/Test/Parser/Expressions/CastExpressionTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Expressions/CastExpressionTests.cs
@@ -107,6 +107,40 @@ namespace ICSharpCode.NRefactory.Tests.Ast
 			Assert.IsTrue(ce.Expression is FieldReferenceExpression);
 			Assert.AreEqual(CastType.Cast, ce.CastType);
 		}
+		
+		[Test]
+		public void CSharpTryCastParenthesizedExpression()
+		{
+			CastExpression ce = ParseUtilCSharp.ParseExpression<CastExpression>("(o) as string");
+			Assert.AreEqual("string", ce.CastTo.ToString());
+			Assert.IsTrue(ce.Expression is ParenthesizedExpression);
+			Assert.AreEqual(CastType.TryCast, ce.CastType);
+		}
+		
+		[Test]
+		public void CSharpCastNegation()
+		{
+			CastExpression ce = ParseUtilCSharp.ParseExpression<CastExpression>("(uint)-negativeValue");
+			Assert.AreEqual("uint", ce.CastTo.ToString());
+			Assert.IsTrue(ce.Expression is UnaryOperatorExpression);
+			Assert.AreEqual(CastType.Cast, ce.CastType);
+		}
+		
+		[Test]
+		public void CSharpSubtractionIsNotCast()
+		{
+			BinaryOperatorExpression boe = ParseUtilCSharp.ParseExpression<BinaryOperatorExpression>("(BigInt)-negativeValue");
+			Assert.IsTrue(boe.Left is ParenthesizedExpression);
+			Assert.IsTrue(boe.Right is IdentifierExpression);
+		}
+		
+		[Test]
+		public void CSharpIntMaxValueToBigInt()
+		{
+			CastExpression ce = ParseUtilCSharp.ParseExpression<CastExpression>("(BigInt)int.MaxValue");
+			Assert.AreEqual("BigInt", ce.CastTo.ToString());
+			Assert.IsTrue(ce.Expression is FieldReferenceExpression);
+		}
 		#endregion
 		
 		#region VB.NET
diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs
index 22dcd5a93c..83b03a8e12 100644
--- a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs
@@ -77,11 +77,9 @@ namespace ICSharpCode.NRefactory.Tests.Ast
 		
 		Expression CheckPropertyInitializationExpression(Expression e, string name)
 		{
-			Assert.IsInstanceOfType(typeof(AssignmentExpression), e);
-			Expression left = ((AssignmentExpression)e).Left;
-			Assert.IsInstanceOfType(typeof(IdentifierExpression), left);
-			Assert.AreEqual(name, ((IdentifierExpression)left).Identifier);
-			return ((AssignmentExpression)e).Right;
+			Assert.IsInstanceOfType(typeof(NamedArgumentExpression), e);
+			Assert.AreEqual(name, ((NamedArgumentExpression)e).Name);
+			return ((NamedArgumentExpression)e).Expression;
 		}
 		
 		void CheckPointObjectCreation(ObjectCreateExpression oce)
diff --git a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
index ec7ccee51e..d95022c4f2 100644
--- a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
+++ b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
@@ -361,6 +361,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public virtual void Dispose()
 		{
 			workbenchWindow = null;
+			UnregisterOnActiveViewContentChanged();
 			if (AutomaticallyRegisterViewOnFiles) {
 				this.Files.Clear();
 			}
@@ -410,6 +411,55 @@ namespace ICSharpCode.SharpDevelop.Gui
 		public event EventHandler IsDirtyChanged;
 		#endregion
 		
+		#region IsActiveViewContent
+		EventHandler isActiveViewContentChanged;
+		bool registeredOnViewContentChange;
+		bool wasActiveViewContent;
+		
+		/// <summary>
+		/// Gets if this view content is the active view content.
+		/// </summary>
+		protected bool IsActiveViewContent {
+			get { return WorkbenchSingleton.Workbench.ActiveViewContent == this; }
+		}
+		
+		/// <summary>
+		/// Is raised when the value of the IsActiveViewContent property changes.
+		/// </summary>
+		protected event EventHandler IsActiveViewContentChanged {
+			add {
+				if (!registeredOnViewContentChange) {
+					// register WorkbenchSingleton.Workbench.ActiveViewContentChanged only on demand
+					wasActiveViewContent = IsActiveViewContent;
+					WorkbenchSingleton.Workbench.ActiveViewContentChanged += OnActiveViewContentChanged;
+					registeredOnViewContentChange = true;
+				}
+				isActiveViewContentChanged += value;
+			}
+			remove {
+				isActiveViewContentChanged -= value;
+			}
+		}
+		
+		void UnregisterOnActiveViewContentChanged()
+		{
+			if (registeredOnViewContentChange) {
+				WorkbenchSingleton.Workbench.ActiveViewContentChanged -= OnActiveViewContentChanged;
+				registeredOnViewContentChange = false;
+			}
+		}
+		
+		void OnActiveViewContentChanged(object sender, EventArgs e)
+		{
+			bool isActiveViewContent = IsActiveViewContent;
+			if (isActiveViewContent != wasActiveViewContent) {
+				wasActiveViewContent = isActiveViewContent;
+				if (isActiveViewContentChanged != null)
+					isActiveViewContentChanged(this, e);
+			}
+		}
+		#endregion
+		
 		public virtual void RedrawContent()
 		{
 		}
diff --git a/src/Main/Base/Project/Src/Services/DisplayBinding/ExternalProcessDisplayBinding.cs b/src/Main/Base/Project/Src/Services/DisplayBinding/ExternalProcessDisplayBinding.cs
index 4f81cb67ea..b0763a7aeb 100644
--- a/src/Main/Base/Project/Src/Services/DisplayBinding/ExternalProcessDisplayBinding.cs
+++ b/src/Main/Base/Project/Src/Services/DisplayBinding/ExternalProcessDisplayBinding.cs
@@ -40,29 +40,30 @@ namespace ICSharpCode.SharpDevelop
 					cmd = CommandLine.Replace("%1", file.FileName);
 				else
 					cmd = CommandLine + " \"" + file.FileName + "\"";
-				StartCommandLine(cmd);
+				StartCommandLine(cmd, Path.GetDirectoryName(file.FileName));
 			} catch (Exception ex) {
 				MessageService.ShowError(ex.Message);
 			}
 			return null;
 		}
 		
-		static void StartCommandLine(string cmd)
+		static void StartCommandLine(string cmd, string workingDir)
 		{
 			LoggingService.Debug("ExternalProcessDisplayBinding> " + cmd);
 			cmd = cmd.Trim();
 			if (cmd.Length == 0) return;
-			string program, arguments;
+			ProcessStartInfo info = new ProcessStartInfo();
 			if (cmd[0] == '"') {
 				int pos = cmd.IndexOf('"', 1);
-				program = cmd.Substring(1, pos - 1);
-				arguments = cmd.Substring(pos + 1).TrimStart();
+				info.FileName = cmd.Substring(1, pos - 1);
+				info.Arguments = cmd.Substring(pos + 1).TrimStart();
 			} else {
 				int pos = cmd.IndexOf(' ', 0);
-				program = cmd.Substring(0, pos);
-				arguments = cmd.Substring(pos + 1);
+				info.FileName = cmd.Substring(0, pos);
+				info.Arguments = cmd.Substring(pos + 1);
 			}
-			Process.Start(program, arguments);
+			info.WorkingDirectory = workingDir;
+			Process.Start(info);
 		}
 	}
 	
diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index 6e716c3500..805781b31e 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -1,176 +1,176 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-# SharpDevelop 3.0.0.2658
+# SharpDevelop 3.0.0.2667
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{388C3979-2621-4839-A955-7E5C03BA0B63}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowDesigner", "AddIns\DisplayBindings\WorkflowDesigner\Project\WorkflowDesigner.csproj", "{533F4684-DBA6-4518-B005-C84F22A2DD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{DB137F0B-9B62-4232-AE92-F7BE0280B8D3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassWizard", "AddIns\DisplayBindings\ClassDiagram\ClassWizard\ClassWizard.csproj", "{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassEditor", "AddIns\DisplayBindings\ClassDiagram\ClassEditor\ClassEditor.csproj", "{F5E059BB-96C2-4398-BED0-8598CD434173}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoAddIn", "AddIns\Misc\MonoAddIn\Project\MonoAddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\Project\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpServerTools", "SharpServerTools", "{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.UI", "AddIns\Misc\SharpServerTools\DataTools.UI\DataTools.UI.csproj", "{87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.Model", "AddIns\Misc\SharpServerTools\DataTools.Model\DataTools.Model.csproj", "{51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.AddIn", "AddIns\Misc\SharpServerTools\SharpDbTools\DataTools.AddIn.csproj", "{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.Model", "AddIns\Misc\SharpServerTools\DataTools.Model\DataTools.Model.csproj", "{51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.UI", "AddIns\Misc\SharpServerTools\DataTools.UI\DataTools.UI.csproj", "{87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\Project\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoAddIn", "AddIns\Misc\MonoAddIn\Project\MonoAddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{DB137F0B-9B62-4232-AE92-F7BE0280B8D3}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassEditor", "AddIns\DisplayBindings\ClassDiagram\ClassEditor\ClassEditor.csproj", "{F5E059BB-96C2-4398-BED0-8598CD434173}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassWizard", "AddIns\DisplayBindings\ClassDiagram\ClassWizard\ClassWizard.csproj", "{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowDesigner", "AddIns\DisplayBindings\WorkflowDesigner\Project\WorkflowDesigner.csproj", "{533F4684-DBA6-4518-B005-C84F22A2DD57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{388C3979-2621-4839-A955-7E5C03BA0B63}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "B13EFF7F-7EA4-4B68-A375-D112105E9182"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 EndProject
-Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "B13EFF7F-7EA4-4B68-A375-D112105E9182"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -504,75 +504,75 @@ Global
 		{9196DD8A-B4D4-4780-8742-C5762E547FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{DB137F0B-9B62-4232-AE92-F7BE0280B8D3} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{388C3979-2621-4839-A955-7E5C03BA0B63} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
-		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {388C3979-2621-4839-A955-7E5C03BA0B63}
-		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {388C3979-2621-4839-A955-7E5C03BA0B63}
-		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {388C3979-2621-4839-A955-7E5C03BA0B63}
-		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {388C3979-2621-4839-A955-7E5C03BA0B63}
-		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
-		{F5E059BB-96C2-4398-BED0-8598CD434173} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
-		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
-		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
-		{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
-		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
-		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{082DCD64-EE32-4151-A50F-E139CF754CC0} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
+		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
 		{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
-		{D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
-		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
-		{51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
-		{87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
-		{B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{082DCD64-EE32-4151-A50F-E139CF754CC0} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
+		{87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
+		{51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
+		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
+		{D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
+		{388C3979-2621-4839-A955-7E5C03BA0B63} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{DB137F0B-9B62-4232-AE92-F7BE0280B8D3} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
+		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
+		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}
+		{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
+		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
+		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
+		{F5E059BB-96C2-4398-BED0-8598CD434173} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
+		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3}
+		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {388C3979-2621-4839-A955-7E5C03BA0B63}
+		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {388C3979-2621-4839-A955-7E5C03BA0B63}
+		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {388C3979-2621-4839-A955-7E5C03BA0B63}
+		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {388C3979-2621-4839-A955-7E5C03BA0B63}
 		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		B13EFF7F-7EA4-4B68-A375-D112105E9182 = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
+		B13EFF7F-7EA4-4B68-A375-D112105E9182 = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 	EndGlobalSection
 EndGlobal